From 781145ee4ca5d4c1b014146e8cad611fe3232401 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 Merged-In: I3126605613202b1e981b4e7f594acb6edbb7d635 --- target/product/base_system.mk | 1 - target/product/media_system.mk | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/target/product/base_system.mk b/target/product/base_system.mk index 2d3548bfe5..1652020e69 100644 --- a/target/product/base_system.mk +++ b/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 diff --git a/target/product/media_system.mk b/target/product/media_system.mk index c2c97629bc..5174ec3453 100644 --- a/target/product/media_system.mk +++ b/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 : 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