Merge "Load ike in system server classpath instead of bootclasspath" am: 77001add05

Change-Id: I8449124d6ec7a9d90386c25abb247db975277c3a

target/product/base_system.mk

@@ -327,7 +327,6 @@ PRODUCT_BOOT_JARS := \
 
 PRODUCT_UPDATABLE_BOOT_JARS := \
     com.android.conscrypt:conscrypt \
-    com.android.ipsec:ike \
     com.android.media:updatable-media \
     com.android.sdkext:framework-sdkextensions \
     com.android.tethering:framework-tethering

target/product/media_system.mk

@@ -59,7 +59,7 @@ PRODUCT_SYSTEM_SERVER_JARS := \
 # system server jars which are updated via apex modules.
 # The values should be of the format <apex name>:<jar name>
 PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS := \
-    # Ex: com.android.wifi:wifi-service
+    com.android.ipsec:android.net.ipsec.ike \
 
 PRODUCT_COPY_FILES += \
     system/core/rootdir/etc/public.libraries.android.txt:system/etc/public.libraries.txt