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

Commit a83dcf43 authored by Yan Yan's avatar Yan Yan Committed by Automerger Merge Worker
Browse files

Merge "Add IKE to bcp and remove it from system server classpath" am: 57b9916d 

Original change: https://android-review.googlesource.com/c/platform/build/+/1546302

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I81fc0d279ec97a8af74628bbd67a280fa74e3bc9
parents 477a8358 57b9916d

target/product/default_art_config.mk

+2 −1
Original line number Diff line number Diff line
@@ -36,7 +36,8 @@ PRODUCT_UPDATABLE_BOOT_JARS := \ 
    com.android.permission:framework-permission \

    com.android.sdkext:framework-sdkextensions \

    com.android.wifi:framework-wifi \

    com.android.tethering:framework-tethering

    com.android.tethering:framework-tethering \

    com.android.ipsec:android.net.ipsec.ike



# Add the compatibility library that is needed when android.test.base

# is removed from the bootclasspath.

target/product/media_system.mk

+0 −1
Original line number Diff line number Diff line
@@ -58,7 +58,6 @@ PRODUCT_SYSTEM_SERVER_JARS := \ 
# The values should be of the format <apex name>:<jar name>

PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS := \

    com.android.permission:service-permission \

    com.android.ipsec:android.net.ipsec.ike \



PRODUCT_COPY_FILES += \

    system/core/rootdir/etc/public.libraries.android.txt:system/etc/public.libraries.txt