diff options
| author | Colin Cross <ccross@android.com> | 2019-05-10 21:20:51 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-05-10 21:20:51 -0700 |
| commit | fd7da36c8eb0f9a3d1b2ccdd27d6d5cf25f231a8 (patch) | |
| tree | 5491b5a4f391d6b8540076f7237b4e216b755de2 | |
| parent | 189a8dff61ce18e4c65e67901a45b4b3d2764833 (diff) | |
| parent | 976dd58b347266a8698fa6d1dbe336a23f4634c9 (diff) | |
| download | build-fd7da36c8eb0f9a3d1b2ccdd27d6d5cf25f231a8.tar.gz | |
Merge "Use a copy of dexpreopt.config"
am: 976dd58b34
Change-Id: I4c3f6ea7e55f6e09d054bb4aa797d407b9bc1822
| -rw-r--r-- | core/dex_preopt_config.mk | 8 | ||||
| -rw-r--r-- | core/dex_preopt_odex_install.mk | 4 |
2 files changed, 3 insertions, 9 deletions
diff --git a/core/dex_preopt_config.mk b/core/dex_preopt_config.mk index b5834b08b3..c44e4bdb5f 100644 --- a/core/dex_preopt_config.mk +++ b/core/dex_preopt_config.mk @@ -1,4 +1,4 @@ -DEX_PREOPT_CONFIG := $(PRODUCT_OUT)/dexpreopt.config +DEX_PREOPT_CONFIG := $(SOONG_OUT_DIR)/dexpreopt.config # The default value for LOCAL_DEX_PREOPT DEX_PREOPT_DEFAULT ?= true @@ -169,12 +169,6 @@ ifeq ($(WRITE_SOONG_VARIABLES),true) fi) endif -# Dummy rule to create dexpreopt.config, it will already have been created -# by the $(file) call above, but a rule needs to exist to keep the dangling -# rule check happy. -$(DEX_PREOPT_CONFIG): - @#empty - DEXPREOPT_GEN_DEPS := \ $(SOONG_HOST_OUT_EXECUTABLES)/profman \ $(DEX2OAT) \ diff --git a/core/dex_preopt_odex_install.mk b/core/dex_preopt_odex_install.mk index 85ddbfa36e..266ebd25f7 100644 --- a/core/dex_preopt_odex_install.mk +++ b/core/dex_preopt_odex_install.mk @@ -242,12 +242,12 @@ ifdef LOCAL_DEX_PREOPT .KATI_RESTAT: $(my_dexpreopt_script) $(my_strip_script) $(my_dexpreopt_script): PRIVATE_MODULE := $(LOCAL_MODULE) - $(my_dexpreopt_script): PRIVATE_GLOBAL_CONFIG := $(PRODUCT_OUT)/dexpreopt.config + $(my_dexpreopt_script): PRIVATE_GLOBAL_CONFIG := $(DEX_PREOPT_CONFIG_FOR_MAKE) $(my_dexpreopt_script): PRIVATE_MODULE_CONFIG := $(my_dexpreopt_config) $(my_dexpreopt_script): PRIVATE_STRIP_SCRIPT := $(my_strip_script) $(my_dexpreopt_script): .KATI_IMPLICIT_OUTPUTS := $(my_strip_script) $(my_dexpreopt_script): $(DEXPREOPT_GEN) - $(my_dexpreopt_script): $(my_dexpreopt_config) $(PRODUCT_OUT)/dexpreopt.config + $(my_dexpreopt_script): $(my_dexpreopt_config) $(DEX_PREOPT_CONFIG_FOR_MAKE) @echo "$(PRIVATE_MODULE) dexpreopt gen" $(DEXPREOPT_GEN) -global $(PRIVATE_GLOBAL_CONFIG) -module $(PRIVATE_MODULE_CONFIG) \ -dexpreopt_script $@ -strip_script $(PRIVATE_STRIP_SCRIPT) \ |