StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Load ike in system server classpath instead of bootclasspath" am: 77001add05 am: e4d9c62b0d

Browse Source 
Change-Id: Ia35da14f15584aa00e9bbf4d91ce753377b18235
This commit is contained in:
Automerger Merge Worker
2020-02-20 19:21:04 +00:00
parent 4da91bcafd e4d9c62b0d
commit 0d54bb5962
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
target/product/base_system.mk
View File

@@ -327,7 +327,6 @@ PRODUCT_BOOT_JARS := \
PRODUCT_UPDATABLE_BOOT_JARS := \ PRODUCT_UPDATABLE_BOOT_JARS := \
com.android.conscrypt:conscrypt \ com.android.conscrypt:conscrypt \
com.android.ipsec:ike \
com.android.media:updatable-media \ com.android.media:updatable-media \
com.android.sdkext:framework-sdkextensions \ com.android.sdkext:framework-sdkextensions \
com.android.tethering:framework-tethering com.android.tethering:framework-tethering

2
target/product/media_system.mk
View File

@@ -59,7 +59,7 @@ PRODUCT_SYSTEM_SERVER_JARS := \
# system server jars which are updated via apex modules. # system server jars which are updated via apex modules.
# The values should be of the format <apex name>:<jar name> # The values should be of the format <apex name>:<jar name>
PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS := \ PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS := \
# Ex: com.android.wifi:wifi-service com.android.ipsec:android.net.ipsec.ike \
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
system/core/rootdir/etc/public.libraries.android.txt:system/etc/public.libraries.txt system/core/rootdir/etc/public.libraries.android.txt:system/etc/public.libraries.txt