Merge "Sort PRODUCT_APEX_SYSTEM_SERVER_JARS automatically."

This commit is contained in:
Treehugger Robot
2021-11-24 19:13:31 +00:00
committed by Gerrit Code Review
2 changed files with 7 additions and 1 deletions

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))
# 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
PRODUCT_SYSTEM_NAME := $(PRODUCT_NAME)
endif

View File

@@ -65,7 +65,7 @@ PRODUCT_APEX_BOOT_JARS := \
com.android.tethering:framework-tethering \
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 := \
com.android.appsearch:service-appsearch \
com.android.art:service-art \