From 0b4f8d542f4a3d8fa9a6af250c7b9de01ef77b11 Mon Sep 17 00:00:00 2001 From: Saeid Farivar Asanjan Date: Mon, 8 Aug 2022 20:23:45 +0000 Subject: [PATCH] Use aapt2 Replace usage of `$(AAPT)` with `$(AAPT2)`. Bug: 236602069 Test: m nothing Change-Id: I079bfe1eebfedda855ff585a20704f4f01c853d6 --- core/Makefile | 2 +- core/dex_preopt_odex_install.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/Makefile b/core/Makefile index e724a43e80..4c1782a096 100644 --- a/core/Makefile +++ b/core/Makefile @@ -6258,7 +6258,7 @@ $(APPCOMPAT_ZIP): $(SOONG_ZIP) # 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 diff --git a/core/dex_preopt_odex_install.mk b/core/dex_preopt_odex_install.mk index 216168b0af..b303b52f12 100644 --- a/core/dex_preopt_odex_install.mk +++ b/core/dex_preopt_odex_install.mk @@ -245,7 +245,7 @@ ifeq (true,$(LOCAL_ENFORCE_USES_LIBRARIES)) $(my_enforced_uses_libraries): PRIVATE_OPTIONAL_USES_LIBRARIES := $(my_optional_uses_libs_args) $(my_enforced_uses_libraries): PRIVATE_DEXPREOPT_CONFIGS := $(my_dexpreopt_config_args) $(my_enforced_uses_libraries): PRIVATE_RELAX_CHECK := $(my_relax_check_arg) - $(my_enforced_uses_libraries): $(AAPT) + $(my_enforced_uses_libraries): $(AAPT2) $(my_enforced_uses_libraries): $(my_verify_script) $(my_enforced_uses_libraries): $(my_dexpreopt_dep_configs) $(my_enforced_uses_libraries): $(my_manifest_or_apk) @@ -254,7 +254,7 @@ ifeq (true,$(LOCAL_ENFORCE_USES_LIBRARIES)) $(my_verify_script) \ --enforce-uses-libraries \ --enforce-uses-libraries-status $@ \ - --aapt $(AAPT) \ + --aapt $(AAPT2) \ $(PRIVATE_USES_LIBRARIES) \ $(PRIVATE_OPTIONAL_USES_LIBRARIES) \ $(PRIVATE_DEXPREOPT_CONFIGS) \