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.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.mk')
| -rw-r--r-- | core/product.mk | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/core/product.mk b/core/product.mk index 0075acd..ed906cb 100644 --- a/core/product.mk +++ b/core/product.mk @@ -100,14 +100,18 @@ _product_var_list := \ PRODUCT_FACTORY_BUNDLE_MODULES \ PRODUCT_RUNTIMES \ PRODUCT_BOOT_JARS \ - PRODUCT_DEX_PREOPT_IMAGE_IN_DATA \ PRODUCT_SUPPORTS_VERITY \ PRODUCT_OEM_PROPERTIES \ PRODUCT_SYSTEM_PROPERTY_BLACKLIST \ PRODUCT_SYSTEM_SERVER_JARS \ PRODUCT_VERITY_SIGNING_KEY \ PRODUCT_SYSTEM_VERITY_PARTITION \ - PRODUCT_VENDOR_VERITY_PARTITION + PRODUCT_VENDOR_VERITY_PARTITION \ + PRODUCT_DEX_PREOPT_IMAGE_IN_DATA \ + PRODUCT_DEX_PREOPT_MODULE_CONFIGS \ + PRODUCT_DEX_PREOPT_DEFAULT_FLAGS \ + PRODUCT_DEX_PREOPT_BOOT_FLAGS \ + define dump-product $(info ==== $(1) ====)\ @@ -299,3 +303,14 @@ endef define add-to-product-copy-files-if-exists $(if $(wildcard $(word 1,$(subst :, ,$(1)))),$(1)) endef + +# whitespace placeholder when we record module's dex-preopt config. +_PDPMC_SP_PLACE_HOLDER := |@SP@| +# Set up dex-preopt config for a module. +# $(1) list of module names +# $(2) the modules' dex-preopt config +define add-product-dex-preopt-module-config +$(eval _c := $(subst $(space),$(_PDPMC_SP_PLACE_HOLDER),$(strip $(2))))\ +$(eval PRODUCT_DEX_PREOPT_MODULE_CONFIGS += \ + $(foreach m,$(1),$(m)=$(_c))) +endef |