From 1173332eb2ff08b1a6e29c876fb94e00c6329531 Mon Sep 17 00:00:00 2001 From: evitayan Date: Thu, 2 Jan 2020 15:39:11 -0800 Subject: [PATCH] Load ike in system server classpath instead of bootclasspath Module IPsec(IKE) will be built as a java_sdk_library and will not be in bootclasspath anymore. It will be loaded in system sevrer classpath so that it can be used by VPN. Bug: 145995723 Test: build, flash, boot Test: atest FramewokrsIkeTests (passed) Test: m mts && mts-tradefed run mts-ipsec (passed) Test: manually tested that it is loaded in system server Change-Id: I3126605613202b1e981b4e7f594acb6edbb7d635 --- target/product/base_system.mk | 1 - target/product/media_system.mk | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/target/product/base_system.mk b/target/product/base_system.mk index 04808ae48..9b74e2e25 100644 --- a/target/product/base_system.mk +++ b/target/product/base_system.mk @@ -334,7 +334,6 @@ PRODUCT_BOOT_JARS := \ 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 \ diff --git a/target/product/media_system.mk b/target/product/media_system.mk index 76debb394..9bf9668cb 100644 --- a/target/product/media_system.mk +++ b/target/product/media_system.mk @@ -62,7 +62,8 @@ PRODUCT_SYSTEM_SERVER_JARS := \ 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