StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use a copy of dexpreopt.config"

Browse Source 
am: 976dd58b34

Change-Id: I4c3f6ea7e55f6e09d054bb4aa797d407b9bc1822
This commit is contained in:
Colin Cross
2019-05-10 21:20:51 -07:00
committed by android-build-merger
parent 189a8dff61 976dd58b34
commit fd7da36c8e
2 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/dex_preopt_config.mk
View File

@@ -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 # The default value for LOCAL_DEX_PREOPT
DEX_PREOPT_DEFAULT ?= true DEX_PREOPT_DEFAULT ?= true
@@ -169,12 +169,6 @@ ifeq ($(WRITE_SOONG_VARIABLES),true)
fi) fi)
endif 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 := \ DEXPREOPT_GEN_DEPS := \
$(SOONG_HOST_OUT_EXECUTABLES)/profman \ $(SOONG_HOST_OUT_EXECUTABLES)/profman \
$(DEX2OAT) \ $(DEX2OAT) \

4
core/dex_preopt_odex_install.mk
View File

@@ -242,12 +242,12 @@ ifdef LOCAL_DEX_PREOPT
.KATI_RESTAT: $(my_dexpreopt_script) $(my_strip_script) .KATI_RESTAT: $(my_dexpreopt_script) $(my_strip_script)
$(my_dexpreopt_script): PRIVATE_MODULE := $(LOCAL_MODULE) $(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_MODULE_CONFIG := $(my_dexpreopt_config)
$(my_dexpreopt_script): PRIVATE_STRIP_SCRIPT := $(my_strip_script) $(my_dexpreopt_script): PRIVATE_STRIP_SCRIPT := $(my_strip_script)
$(my_dexpreopt_script): .KATI_IMPLICIT_OUTPUTS := $(my_strip_script) $(my_dexpreopt_script): .KATI_IMPLICIT_OUTPUTS := $(my_strip_script)
$(my_dexpreopt_script): $(DEXPREOPT_GEN) $(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" @echo "$(PRIVATE_MODULE) dexpreopt gen"
$(DEXPREOPT_GEN) -global $(PRIVATE_GLOBAL_CONFIG) -module $(PRIVATE_MODULE_CONFIG) \ $(DEXPREOPT_GEN) -global $(PRIVATE_GLOBAL_CONFIG) -module $(PRIVATE_MODULE_CONFIG) \
-dexpreopt_script $@ -strip_script $(PRIVATE_STRIP_SCRIPT) \ -dexpreopt_script $@ -strip_script $(PRIVATE_STRIP_SCRIPT) \