commit 4d19b14e7b26809c62e19c4c55a4957707bbf51a
author Yan Yan <evitayan@google.com> Thu Feb 20 06:42:22 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Feb 20 06:42:22 2020 +0000
tree d36465c6572ff4abbff3d3f79e8b923dae6a827b
parent dfa3d2396998fc0ab4f81f32f72f45efb12ddb29
parent 1173332eb2ff08b1a6e29c876fb94e00c6329531

Merge "Load ike in system server classpath instead of bootclasspath"

target/product/base_system.mk

diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index 04808ae..9b74e2e 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -334,7 +334,6 @@
 PRODUCT_UPDATABLE_BOOT_JARS := \
     com.android.appsearch:framework-appsearch \
     com.android.conscrypt:conscrypt \
-    com.android.ipsec:ike \
     com.android.media:updatable-media \
     com.android.mediaprovider:framework-mediaprovider \
     com.android.os.statsd:framework-statsd \

target/product/media_system.mk

diff --git a/target/product/media_system.mk b/target/product/media_system.mk
index 76debb3..9bf9668 100644
--- a/target/product/media_system.mk
+++ b/target/product/media_system.mk
@@ -62,7 +62,8 @@
 PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS := \
     com.android.appsearch:service-appsearch \
     com.android.permission:service-permission \
-    com.android.wifi:wifi-service
+    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