commit f2353be75397d2a746e55563bca173d79fc772d1
author Eric Miao <ericymiao@google.com> Thu Nov 11 05:38:41 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Nov 11 05:38:41 2021 +0000
tree 3b7c8b9055c6408db10d6abbbc15a625a5f0c259
parent e9b9bc220372a34d4cd11ce793196510cb5d40fb
parent 4f869bee859339a4be54d6eadb1085b61275b476

Merge "Add oatdump and dexdump to dexpreopt_tools.zip" am: 6f2d435d8d am: caddb0004f am: 2a03d646ca am: 4f869bee85

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

Change-Id: I800c748f2cbd2591db4919688931125c17675106

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index 486188e..b26f635 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -5433,6 +5433,8 @@
 ifeq ($(BUILD_OS),linux)
 ifneq ($(DEX2OAT),)
 dexpreopt_tools_deps := $(DEXPREOPT_GEN_DEPS) $(DEXPREOPT_GEN) $(AAPT2)
+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)