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
This commit is contained in:
evitayan 2020-01-02 15:39:11 -08:00
parent 4e3bceed4d
commit 1173332eb2
2 changed files with 2 additions and 2 deletions

View File

@ -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 \

View File

@ -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