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

Merge "Sort PRODUCT_APEX_SYSTEM_SERVER_JARS automatically." am: 03aa6cd538

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

Change-Id: I0ec4ccb90656eb52aca495a4da7ba64c033418df
This commit is contained in:
Treehugger Robot
2021-11-24 19:34:15 +00:00
committed by Automerger Merge Worker
parent 72c70affba 03aa6cd538
commit 3f8601901a
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/product_config.mk
View File

@@ -320,6 +320,12 @@ 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
# constructing SYSTEMSERVERCLASSPATH definition on device after a Mainline
# update. Enforce it in the build system as well to avoid recompiling everything
# after an update due a change in SYSTEMSERVERCLASSPATH order.
PRODUCT_APEX_SYSTEM_SERVER_JARS := $(sort $(PRODUCT_APEX_SYSTEM_SERVER_JARS))
ifndef PRODUCT_SYSTEM_NAME ifndef PRODUCT_SYSTEM_NAME
PRODUCT_SYSTEM_NAME := $(PRODUCT_NAME) PRODUCT_SYSTEM_NAME := $(PRODUCT_NAME)
endif endif

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. Keep the list sorted by module names and then library names. # APEX system server jars. The list will be sorted automatically.
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 \