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

Merge "Sort PRODUCT_APEX_BOOT_JARS automatically." am: af78df0553

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

Change-Id: I82cebfc087ff033f7852c0550fb4568640493021
This commit is contained in:
Ulyana Trafimovich
2021-11-29 12:04:30 +00:00
committed by Automerger Merge Worker
parent 638472caa8 af78df0553
commit b128e28695
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/product_config.mk
View File

@@ -320,10 +320,11 @@ PRODUCT_SYSTEM_SERVER_JARS += $(PRODUCT_SYSTEM_SERVER_JARS_EXTRA)
PRODUCT_SYSTEM_SERVER_JARS := $(call qualify-platform-jars,$(PRODUCT_SYSTEM_SERVER_JARS)) PRODUCT_SYSTEM_SERVER_JARS := $(call qualify-platform-jars,$(PRODUCT_SYSTEM_SERVER_JARS))
# Sort APEX system server jars. We use deterministic alphabetical order when # Sort APEX boot and system server jars. We use deterministic alphabetical order
# constructing SYSTEMSERVERCLASSPATH definition on device after a Mainline # when constructing BOOTCLASSPATH and SYSTEMSERVERCLASSPATH definition on device
# update. Enforce it in the build system as well to avoid recompiling everything # after an update. Enforce it in the build system as well to avoid recompiling
# after an update due a change in SYSTEMSERVERCLASSPATH order. # everything after an update due a change in the order.
PRODUCT_APEX_BOOT_JARS := $(sort $(PRODUCT_APEX_BOOT_JARS))
PRODUCT_APEX_SYSTEM_SERVER_JARS := $(sort $(PRODUCT_APEX_SYSTEM_SERVER_JARS)) PRODUCT_APEX_SYSTEM_SERVER_JARS := $(sort $(PRODUCT_APEX_SYSTEM_SERVER_JARS))
ifndef PRODUCT_SYSTEM_NAME ifndef PRODUCT_SYSTEM_NAME

2
target/product/default_art_config.mk
View File

@@ -65,7 +65,7 @@ PRODUCT_APEX_BOOT_JARS := \
com.android.tethering:framework-tethering \ com.android.tethering:framework-tethering \
com.android.wifi:framework-wifi com.android.wifi:framework-wifi
# APEX system server jars. The list will be sorted automatically. # APEX system server jars. Keep the list sorted by module names and then library names.
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 \