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

Merge "Move PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS to default_art_config.mk."

Browse Source
This commit is contained in:
Treehugger Robot
2021-06-10 15:57:53 +00:00
committed by Gerrit Code Review
parent c137b8520b d56062009a
commit 72e0ffd918
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
target/product/default_art_config.mk
View File

@@ -48,7 +48,7 @@ PRODUCT_BOOT_JARS += \
PRODUCT_BOOT_JARS += \
com.android.i18n:core-icu4j
# Updatable APEX jars. Keep the list sorted by module names and then library names.
# Updatable APEX boot jars. Keep the list sorted by module names and then library names.
PRODUCT_UPDATABLE_BOOT_JARS := \
com.android.conscrypt:conscrypt \
com.android.ipsec:android.net.ipsec.ike \
@@ -60,6 +60,11 @@ PRODUCT_UPDATABLE_BOOT_JARS := \
com.android.tethering:framework-tethering \
com.android.wifi:framework-wifi
# Updatable APEX system server jars. Keep the list sorted by module names and then library names.
PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS := \
com.android.art:service-art \
com.android.permission:service-permission \
# Minimal configuration for running dex2oat (default argument values).
# PRODUCT_USES_DEFAULT_ART_CONFIG must be true to enable boot image compilation.
PRODUCT_USES_DEFAULT_ART_CONFIG := true

6
target/product/media_system.mk
View File

@@ -54,12 +54,6 @@ PRODUCT_SYSTEM_SERVER_JARS := \
services \
ethernet-service
# 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 := \
com.android.art:service-art \
com.android.permission:service-permission \
PRODUCT_COPY_FILES += \
system/core/rootdir/etc/public.libraries.android.txt:system/etc/public.libraries.txt