commit 0b4f8d542f4a3d8fa9a6af250c7b9de01ef77b11
author Saeid Farivar Asanjan <farivar@google.com> Mon Aug 08 20:23:45 2022 +0000
committer Saeid Farivar Asanjan <farivar@google.com> Tue Aug 09 16:14:38 2022 +0000
tree 29f7c26cf9f72b80b55df21dee3211dc9d343e70
parent 85125778f571e6e626c7f7de71a847a2b40bf25c

Use aapt2

Replace usage of `$(AAPT)` with `$(AAPT2)`.

Bug: 236602069
Test: m nothing
Change-Id: I079bfe1eebfedda855ff585a20704f4f01c853d6

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index e724a43..4c1782a 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -6258,7 +6258,7 @@
 # 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) $(AAPT2)
+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