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

Commit 7dfa9045 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove make code that built dexpreopt_tools.zip" into main am: fe52f952 am: ccd8dbae 

Original change: https://android-review.googlesource.com/c/platform/build/+/3525670



Change-Id: Ib9c002d835b1c5aac956aa390c3fa4d28f85079f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 83f52d0a ccd8dbae

core/Makefile

+0 −16
Original line number Diff line number Diff line
@@ -7148,22 +7148,6 @@ $(APPCOMPAT_ZIP): $(SOONG_ZIP) 
	$(hide) find $(PRODUCT_OUT)/appcompat | sort >$(PRIVATE_LIST_FILE)

	$(hide) $(SOONG_ZIP) -d -o $@ -C $(PRODUCT_OUT)/appcompat -l $(PRIVATE_LIST_FILE)



# The mac build doesn't build dex2oat, so create the zip file only if the build OS is linux.

ifeq ($(BUILD_OS),linux)

ifneq ($(DEX2OAT),)

dexpreopt_tools_deps := $(DEXPREOPT_GEN_DEPS) $(DEXPREOPT_GEN)

dexpreopt_tools_deps += $(HOST_OUT_EXECUTABLES)/dexdump

dexpreopt_tools_deps += $(HOST_OUT_EXECUTABLES)/oatdump

DEXPREOPT_TOOLS_ZIP := $(PRODUCT_OUT)/dexpreopt_tools.zip

$(DEXPREOPT_TOOLS_ZIP): $(dexpreopt_tools_deps)

$(DEXPREOPT_TOOLS_ZIP): PRIVATE_DEXPREOPT_TOOLS_DEPS := $(dexpreopt_tools_deps)

$(DEXPREOPT_TOOLS_ZIP): $(SOONG_ZIP)

	$(hide) mkdir -p $(dir $@)

	$(hide) $(SOONG_ZIP) -d -o $@ -j $(addprefix -f ,$(PRIVATE_DEXPREOPT_TOOLS_DEPS)) -f $$(realpath $(DEX2OAT))

$(call declare-1p-target,$(DEXPREOPT_TOOLS_ZIP),)

endif # DEX2OAT is set

endif # BUILD_OS == linux



DEXPREOPT_CONFIG_ZIP := $(PRODUCT_OUT)/dexpreopt_config.zip



$(DEXPREOPT_CONFIG_ZIP): $(INSTALLED_SYSTEMIMAGE_TARGET) \

core/main.mk

+0 −1
Original line number Diff line number Diff line
@@ -1555,7 +1555,6 @@ else ifeq ($(TARGET_BUILD_UNBUNDLED),$(TARGET_BUILD_UNBUNDLED_IMAGE)) 
  $(call dist-for-goals, droidcore, \

    $(BUILT_OTATOOLS_PACKAGE) \

    $(APPCOMPAT_ZIP) \

    $(DEXPREOPT_TOOLS_ZIP) \

  )



  # We dist the following targets for droidcore-unbundled (and droidcore since