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

Merge "Update comments for Makefile variables about APEX jars." am: e685560087 am: 3cc272c031 am: dbe5fcc828

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/1931602

Change-Id: I6418516104d706c25cc27cc7cca5a46016d6af05
This commit is contained in:
Treehugger Robot
2021-12-22 19:37:54 +00:00
committed by Automerger Merge Worker
parent eabf1e38fa dbe5fcc828
commit b3e1308797
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
target/product/default_art_config.mk
View File

@@ -49,6 +49,7 @@ PRODUCT_BOOT_JARS += \
# APEX boot jars. Keep the list sorted by module names and then library names. # APEX boot jars. Keep the list sorted by module names and then library names.
# Note: core-icu4j is moved back to PRODUCT_BOOT_JARS in product_config.mk at a later stage. # Note: core-icu4j is moved back to PRODUCT_BOOT_JARS in product_config.mk at a later stage.
# Note: For modules available in Q, DO NOT add new entries here.
PRODUCT_APEX_BOOT_JARS := \ PRODUCT_APEX_BOOT_JARS := \
com.android.appsearch:framework-appsearch \ com.android.appsearch:framework-appsearch \
com.android.conscrypt:conscrypt \ com.android.conscrypt:conscrypt \
@@ -67,6 +68,7 @@ PRODUCT_APEX_BOOT_JARS := \
# List of system_server classpath jars delivered via apex. # List of system_server classpath jars delivered via apex.
# Keep the list sorted by module names and then library names. # Keep the list sorted by module names and then library names.
# Note: For modules available in Q, DO NOT add new entries here.
PRODUCT_APEX_SYSTEM_SERVER_JARS := \ PRODUCT_APEX_SYSTEM_SERVER_JARS := \
com.android.appsearch:service-appsearch \ com.android.appsearch:service-appsearch \
com.android.art:service-art \ com.android.art:service-art \
@@ -81,6 +83,7 @@ PRODUCT_STANDALONE_SYSTEM_SERVER_JARS := \
# List of jars delivered via apex that system_server loads dynamically using separate classloaders. # List of jars delivered via apex that system_server loads dynamically using separate classloaders.
# Keep the list sorted by module names and then library names. # Keep the list sorted by module names and then library names.
# Note: For modules available in Q, DO NOT add new entries here.
PRODUCT_APEX_STANDALONE_SYSTEM_SERVER_JARS := \ PRODUCT_APEX_STANDALONE_SYSTEM_SERVER_JARS := \
com.android.os.statsd:service-statsd \ com.android.os.statsd:service-statsd \
com.android.scheduling:service-scheduling \ com.android.scheduling:service-scheduling \