commit e4d9c62b0d7e9d79a4c05f17daa6430dc2e47d3d
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Feb 20 19:00:03 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Feb 20 19:00:03 2020 +0000
tree f7e50ee8876fb66cd88610f4a905832ac406e42f
parent 84a1838b46cbb7d0e7296aa8c19d1ae71018770e
parent 77001add05e997c2105ffdb1490933541972b9b1

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

Change-Id: I8449124d6ec7a9d90386c25abb247db975277c3a

target/product/base_system.mk

diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index 2d3548b..1652020 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -327,7 +327,6 @@
 
 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

diff --git a/target/product/media_system.mk b/target/product/media_system.mk
index c2c9762..5174ec3 100644
--- a/target/product/media_system.mk
+++ b/target/product/media_system.mk
@@ -59,7 +59,7 @@
 # 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