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

Commit 4d19b14e authored by Yan Yan's avatar Yan Yan Committed by Android (Google) Code Review
Browse files

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

parents dfa3d239 1173332e

target/product/base_system.mk

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

target/product/media_system.mk

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