Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2a703ce2 authored by Rock.Yeh's avatar Rock.Yeh Committed by Denis Hsu
Browse files

Add PRODUCT_SYSTEM_SERVER_JARS_EXTRA interface 

This interface allows vendor to append their system server jars after AOSP's
without changing inherit order.

Test: booting
Test: build pass on branch r-fs-release with this patch

Change-Id: I0ddf35bdf725c262f817985f5494b5968db21fcd
parent be01cf84

core/product.mk

+4 −0
Original line number Diff line number Diff line
@@ -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

core/product_config.mk

+3 −0
Original line number Diff line number Diff line
@@ -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