Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 781145ee authored by evitayan's avatar evitayan Committed by Yan Yan
Browse files

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
parent 9021d5c4

target/product/base_system.mk

+0 −1
Original line number Diff line number Diff line
@@ -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

target/product/media_system.mk

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ PRODUCT_SYSTEM_SERVER_JARS := \ 
# 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