Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5c70ea38 authored by Colin Cross's avatar Colin Cross Committed by android-build-merger
Browse files

Merge "Use a copy of dexpreopt.config" am: 976dd58b 

am: fd7da36c

Change-Id: I68092fff3d5f8e5610c10ce799ad9bf23b3b0490
parents 5ed6499a fd7da36c

core/dex_preopt_config.mk

+1 −7
Original line number Diff line number Diff line 
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) \

core/dex_preopt_odex_install.mk

+2 −2
Original line number Diff line number Diff line
@@ -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) \