Allow custom compiler filters for system server jars
Passing down a compiler filter in LOCAL_DEX_PREOPT_FLAGS or PRODUCT_DEX_PREOPT_DEFAULT_FLAGS will no longer always get overridden to speed. Bug: 62356545 Test: make and flash Change-Id: I8b777c8881cba6b11cda56d27f0a714c92d70d94
This commit is contained in:
parent
beb834d37e
commit
b8d3cc02cd
1 changed files with 7 additions and 7 deletions
|
@ -175,17 +175,17 @@ LOCAL_DEX_PREOPT_FLAGS := $(PRODUCT_DEX_PREOPT_DEFAULT_FLAGS)
|
|||
endif
|
||||
endif
|
||||
|
||||
ifneq (,$(filter $(PRODUCT_SYSTEM_SERVER_JARS) $(PRODUCT_DEXPREOPT_SPEED_APPS) $(PRODUCT_SYSTEM_SERVER_APPS),$(LOCAL_MODULE)))
|
||||
# Jars of system server, apps loaded into system server, and apps the product wants to be
|
||||
# compiled with the 'speed' compiler filter.
|
||||
LOCAL_DEX_PREOPT_FLAGS += --compiler-filter=speed
|
||||
else
|
||||
# If no compiler filter is specified, default to 'quicken' to save on storage.
|
||||
ifeq (,$(filter --compiler-filter=%, $(LOCAL_DEX_PREOPT_FLAGS)))
|
||||
ifeq (,$(filter --compiler-filter=%, $(LOCAL_DEX_PREOPT_FLAGS)))
|
||||
ifneq (,$(filter $(PRODUCT_SYSTEM_SERVER_JARS) $(PRODUCT_DEXPREOPT_SPEED_APPS) $(PRODUCT_SYSTEM_SERVER_APPS),$(LOCAL_MODULE)))
|
||||
# Jars of system server, apps loaded into system server, and apps the product default to being
|
||||
# compiled with the 'speed' compiler filter.
|
||||
LOCAL_DEX_PREOPT_FLAGS += --compiler-filter=speed
|
||||
else
|
||||
ifeq (true,$(LOCAL_DEX_PREOPT_GENERATE_PROFILE))
|
||||
# For non system server jars, use speed-profile when we have a profile.
|
||||
LOCAL_DEX_PREOPT_FLAGS += --compiler-filter=speed-profile
|
||||
else
|
||||
# If no compiler filter is specified, default to 'quicken' to save on storage.
|
||||
LOCAL_DEX_PREOPT_FLAGS += --compiler-filter=quicken
|
||||
endif
|
||||
endif
|
||||
|
|
Loading…
Reference in a new issue