diff options
| -rw-r--r-- | core/product.mk | 4 | ||||
| -rw-r--r-- | core/product_config.mk | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/core/product.mk b/core/product.mk index b497abb5b3..ea9be72a81 100644 --- a/core/product.mk +++ b/core/product.mk @@ -240,6 +240,10 @@ _product_list_vars += PRODUCT_SYSTEM_SERVER_JARS # List of system_server jars delivered via apex. Format = <apex name>:<jar name>. _product_list_vars += PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS +# Additional system server jars to be appended at the end of the common list. +# This is necessary to avoid jars reordering due to makefile inheritance order. +_product_list_vars += PRODUCT_SYSTEM_SERVER_JARS_EXTRA + # All of the apps that we force preopt, this overrides WITH_DEXPREOPT. _product_list_vars += PRODUCT_ALWAYS_PREOPT_EXTRACTED_APK _product_list_vars += PRODUCT_DEXPREOPT_SPEED_APPS diff --git a/core/product_config.mk b/core/product_config.mk index aabd472704..699d62aaf6 100644 --- a/core/product_config.mk +++ b/core/product_config.mk @@ -231,6 +231,9 @@ PRODUCT_AAPT_CONFIG := $(subst $(space),$(comma),$(PRODUCT_AAPT_CONFIG)) # Extra boot jars must be appended at the end after common boot jars. PRODUCT_BOOT_JARS += $(PRODUCT_BOOT_JARS_EXTRA) +# The extra system server jars must be appended at the end after common system server jars. +PRODUCT_SYSTEM_SERVER_JARS += $(PRODUCT_SYSTEM_SERVER_JARS_EXTRA) + ifndef PRODUCT_SYSTEM_NAME PRODUCT_SYSTEM_NAME := $(PRODUCT_NAME) endif |