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

Commit 2e31874c authored by Martin Stjernholm's avatar Martin Stjernholm Committed by Gerrit Code Review
Browse files

Merge "Remove generation of the dexpreopt tool paths from make."

parents 620a2f23 1e558174

core/dex_preopt_config.mk

+0 −26
Original line number Diff line number Diff line
@@ -37,14 +37,6 @@ ifeq ($(HOST_OS),linux) 
  endif

endif



# Default to debug version to help find bugs.

# Set USE_DEX2OAT_DEBUG to false for only building non-debug versions.

ifeq ($(USE_DEX2OAT_DEBUG),false)

DEX2OAT := $(SOONG_HOST_OUT_EXECUTABLES)/dex2oat$(HOST_EXECUTABLE_SUFFIX)

else

DEX2OAT := $(SOONG_HOST_OUT_EXECUTABLES)/dex2oatd$(HOST_EXECUTABLE_SUFFIX)

endif



# Use the first preloaded-classes file in PRODUCT_COPY_FILES.

PRELOADED_CLASSES := $(call word-colon,1,$(firstword \

    $(filter %system/etc/preloaded-classes,$(PRODUCT_COPY_FILES))))
@@ -134,16 +126,6 @@ ifeq ($(WRITE_SOONG_VARIABLES),true) 
  $(call add_json_str,  Dex2oatImageXmx,                    $(DEX2OAT_IMAGE_XMX))

  $(call add_json_str,  Dex2oatImageXms,                    $(DEX2OAT_IMAGE_XMS))



  $(call add_json_map,  Tools)

  $(call add_json_str,  Profman,                            $(SOONG_HOST_OUT_EXECUTABLES)/profman)

  $(call add_json_str,  Dex2oat,                            $(DEX2OAT))

  $(call add_json_str,  Aapt,                               $(SOONG_HOST_OUT_EXECUTABLES)/aapt)

  $(call add_json_str,  SoongZip,                           $(SOONG_ZIP))

  $(call add_json_str,  Zip2zip,                            $(ZIP2ZIP))

  $(call add_json_str,  ManifestCheck,                      $(SOONG_HOST_OUT_EXECUTABLES)/manifest_check)

  $(call add_json_str,  ConstructContext,                   $(BUILD_SYSTEM)/construct_context.sh)

  $(call end_json_map)



  $(call json_end)



  $(shell mkdir -p $(dir $(DEX_PREOPT_CONFIG)))
@@ -156,11 +138,3 @@ ifeq ($(WRITE_SOONG_VARIABLES),true) 
      rm $(DEX_PREOPT_CONFIG).tmp; \

    fi)

endif
 


DEXPREOPT_GEN_DEPS := \

  $(SOONG_HOST_OUT_EXECUTABLES)/profman \

  $(DEX2OAT) \

  $(SOONG_HOST_OUT_EXECUTABLES)/aapt \

  $(SOONG_ZIP) \

  $(ZIP2ZIP) \

  $(BUILD_SYSTEM)/construct_context.sh \

core/dex_preopt_odex_install.mk

+6 −2
Original line number Diff line number Diff line
@@ -259,12 +259,16 @@ ifdef LOCAL_DEX_PREOPT 


  .KATI_RESTAT: $(my_dexpreopt_script)

  $(my_dexpreopt_script): PRIVATE_MODULE := $(LOCAL_MODULE)

  $(my_dexpreopt_script): PRIVATE_GLOBAL_SOONG_CONFIG := $(DEX_PREOPT_SOONG_CONFIG_FOR_MAKE)

  $(my_dexpreopt_script): PRIVATE_GLOBAL_CONFIG := $(DEX_PREOPT_CONFIG_FOR_MAKE)

  $(my_dexpreopt_script): PRIVATE_MODULE_CONFIG := $(my_dexpreopt_config)

  $(my_dexpreopt_script): $(DEXPREOPT_GEN)

  $(my_dexpreopt_script): $(my_dexpreopt_config) $(DEX_PREOPT_CONFIG_FOR_MAKE)

  $(my_dexpreopt_script): $(my_dexpreopt_config) $(DEX_PREOPT_SOONG_CONFIG_FOR_MAKE) $(DEX_PREOPT_CONFIG_FOR_MAKE)

	@echo "$(PRIVATE_MODULE) dexpreopt gen"

	$(DEXPREOPT_GEN) -global $(PRIVATE_GLOBAL_CONFIG) -module $(PRIVATE_MODULE_CONFIG) \

	$(DEXPREOPT_GEN) \

	-global_soong $(PRIVATE_GLOBAL_SOONG_CONFIG) \

	-global $(PRIVATE_GLOBAL_CONFIG) \

	-module $(PRIVATE_MODULE_CONFIG) \

	-dexpreopt_script $@ \

	-out_dir $(OUT_DIR)