commit 2a03d646ca51eca25efa9d252e01d7ca807f43bf
author Eric Miao <ericymiao@google.com> Thu Nov 11 05:04:44 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Nov 11 05:04:44 2021 +0000
tree 82b92eecd2c23018be12f790e88fca00f5ecef69
parent 3ac2ecaff6f72e65970fdb7defb2fe3b05d2d77b
parent caddb0004f9a3b911f256c70e3084f8dd4e5a608

Merge "Add oatdump and dexdump to dexpreopt_tools.zip" am: 6f2d435d8d am: caddb0004f

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

Change-Id: I5e8f59370d51845a84e2e4964ec63b88996785ee

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)