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/dex_preopt_odex_install.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/dex_preopt_odex_install.mk')
| -rw-r--r-- | core/dex_preopt_odex_install.mk | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/core/dex_preopt_odex_install.mk b/core/dex_preopt_odex_install.mk index 741f9a3..90ae08f 100644 --- a/core/dex_preopt_odex_install.mk +++ b/core/dex_preopt_odex_install.mk @@ -11,7 +11,12 @@ else # WITH_DEXPREOPT=true ifndef LOCAL_DEX_PREOPT # LOCAL_DEX_PREOPT undefined ifneq ($(filter $(TARGET_OUT)/%,$(my_module_path)),) # Installed to system.img. ifeq (,$(LOCAL_APK_LIBRARIES)) # LOCAL_APK_LIBRARIES empty - LOCAL_DEX_PREOPT := $(DEX_PREOPT_DEFAULT) + # If we have product-specific config for this module? + ifeq (disable,$(DEXPREOPT.$(TARGET_PRODUCT).$(LOCAL_MODULE).CONFIG)) + LOCAL_DEX_PREOPT := false + else + LOCAL_DEX_PREOPT := $(DEX_PREOPT_DEFAULT) + endif else # LOCAL_APK_LIBRARIES not empty LOCAL_DEX_PREOPT := nostripping endif # LOCAL_APK_LIBRARIES not empty @@ -94,6 +99,14 @@ endif # libart endif # boot jar ifdef built_odex +ifndef LOCAL_DEX_PREOPT_FLAGS +LOCAL_DEX_PREOPT_FLAGS := $(DEXPREOPT.$(TARGET_PRODUCT).$(LOCAL_MODULE).CONFIG) +ifndef LOCAL_DEX_PREOPT_FLAGS +LOCAL_DEX_PREOPT_FLAGS := $(PRODUCT_DEX_PREOPT_DEFAULT_FLAGS) +endif +endif +$(built_odex): PRIVATE_DEX_PREOPT_FLAGS := $(LOCAL_DEX_PREOPT_FLAGS) + # Use pattern rule - we may have multiple installed odex files. # Ugly syntax - See the definition get-odex-file-path. $(installed_odex) : $(dir $(LOCAL_INSTALLED_MODULE))%$(notdir $(word 1,$(installed_odex))) \ |