Merge "Install dexpreopt artifacts of non system apps in system_other" into main
This commit is contained in:
@@ -504,8 +504,8 @@ ifdef LOCAL_DEX_PREOPT
|
|||||||
_system_other := $(strip $(if $(strip $(BOARD_USES_SYSTEM_OTHER_ODEX)), \
|
_system_other := $(strip $(if $(strip $(BOARD_USES_SYSTEM_OTHER_ODEX)), \
|
||||||
$(if $(strip $(SANITIZE_LITE)),, \
|
$(if $(strip $(SANITIZE_LITE)),, \
|
||||||
$(if $(filter $(_dexname),$(PRODUCT_DEXPREOPT_SPEED_APPS))$(filter $(_dexname),$(PRODUCT_SYSTEM_SERVER_APPS)),, \
|
$(if $(filter $(_dexname),$(PRODUCT_DEXPREOPT_SPEED_APPS))$(filter $(_dexname),$(PRODUCT_SYSTEM_SERVER_APPS)),, \
|
||||||
$(if $(strip $(foreach myfilter,$(SYSTEM_OTHER_ODEX_FILTER),$(filter system/$(myfilter),$(_dexlocation)))), \
|
$(if $(strip $(foreach myfilter,$(SYSTEM_OTHER_ODEX_FILTER),$(filter system/$(myfilter),$(_dexlocation))$(filter $(myfilter),$(_dexlocation)))), \
|
||||||
system_other/)))))
|
system_other/)))))
|
||||||
# _dexdir has a trailing /
|
# _dexdir has a trailing /
|
||||||
_dexdir := $(_system_other)$(dir $(_dexlocation))
|
_dexdir := $(_system_other)$(dir $(_dexlocation))
|
||||||
my_dexpreopt_zip_contents := $(sort \
|
my_dexpreopt_zip_contents := $(sort \
|
||||||
|
Reference in New Issue
Block a user