diff options
| author | Ying Wang <wangying@google.com> | 2014-10-09 19:29:53 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2014-10-09 19:29:53 -0700 |
| commit | 8755756f26a1eaf384ecae64fd00c1873abcf26f (patch) | |
| tree | 72141d9f642c660bb9cbae0fc3f18942c444694d /core/product_config.mk | |
| parent | 37df3be46dfc74fa4ec355554a582014ec77e64b (diff) | |
| parent | 3907c03e24a42513dae8544a19f3cefb813a1c54 (diff) | |
| download | build-8755756f26a1eaf384ecae64fd00c1873abcf26f.zip build-8755756f26a1eaf384ecae64fd00c1873abcf26f.tar.gz build-8755756f26a1eaf384ecae64fd00c1873abcf26f.tar.bz2 | |
resolved conflicts for merge of 3907c03e to lmp-dev-plus-aosp
Change-Id: I580ab0693609ff506da7346548a45322000114d1
Diffstat (limited to 'core/product_config.mk')
| -rw-r--r-- | core/product_config.mk | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/core/product_config.mk b/core/product_config.mk index 32e351c..d4ba364 100644 --- a/core/product_config.mk +++ b/core/product_config.mk @@ -416,3 +416,21 @@ PRODUCT_EXTRA_RECOVERY_KEYS := $(sort \ # If there is no room in /system for the image, place it in /data PRODUCT_DEX_PREOPT_IMAGE_IN_DATA := \ $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_DEX_PREOPT_IMAGE_IN_DATA)) + +PRODUCT_DEX_PREOPT_DEFAULT_FLAGS := \ + $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_DEX_PREOPT_DEFAULT_FLAGS)) +PRODUCT_DEX_PREOPT_BOOT_FLAGS := \ + $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_DEX_PREOPT_BOOT_FLAGS)) +# Resolve and setup per-module dex-preopot configs. +PRODUCT_DEX_PREOPT_MODULE_CONFIGS := \ + $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_DEX_PREOPT_MODULE_CONFIGS)) +# If a module has multiple setups, the first takes precedence. +_pdpmc_modules := +$(foreach c,$(PRODUCT_DEX_PREOPT_MODULE_CONFIGS),\ + $(eval m := $(firstword $(subst =,$(space),$(c))))\ + $(if $(filter $(_pdpmc_modules),$(m)),,\ + $(eval _pdpmc_modules += $(m))\ + $(eval cf := $(patsubst $(m)=%,%,$(c)))\ + $(eval cf := $(subst $(_PDPMC_SP_PLACE_HOLDER),$(space),$(cf)))\ + $(eval DEXPREOPT.$(TARGET_PRODUCT).$(m).CONFIG := $(cf)))) +_pdpmc_modules := |