From 6353304dc9895996c2572c672fa05d9a925ff700 Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Fri, 17 Nov 2017 18:39:55 -0800 Subject: [PATCH] Switch aidl and zipalign prebuilts to build-tools So that they can be updated more regularly than prebuilts/sdk/tools. Bug: 69431993 Test: tapas ExactCalculator; m Change-Id: Id07ab43f9d9e0c794cc15f21b75ae88c3547d8bd --- core/config.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/config.mk b/core/config.mk index 05fb92668..0d25afefa 100644 --- a/core/config.mk +++ b/core/config.mk @@ -536,14 +536,14 @@ ifeq (,$(TARGET_BUILD_APPS)$(filter true,$(TARGET_BUILD_PDK))) ZIPALIGN := $(HOST_OUT_EXECUTABLES)/zipalign else # TARGET_BUILD_APPS || TARGET_BUILD_PDK - AIDL := $(prebuilt_sdk_tools_bin)/aidl + AIDL := $(prebuilt_build_tools_bin)/aidl AAPT := $(prebuilt_sdk_tools_bin)/aapt AAPT2 := $(prebuilt_sdk_tools_bin)/aapt2 DESUGAR := $(prebuilt_build_tools_jars)/desugar.jar MAINDEXCLASSES := $(prebuilt_sdk_tools)/mainDexClasses SIGNAPK_JAR := $(prebuilt_sdk_tools)/lib/signapk$(COMMON_JAVA_PACKAGE_SUFFIX) SIGNAPK_JNI_LIBRARY_PATH := $(prebuilt_sdk_tools)/$(HOST_OS)/lib64 - ZIPALIGN := $(prebuilt_sdk_tools_bin)/zipalign + ZIPALIGN := $(prebuilt_build_tools_bin)/zipalign endif # TARGET_BUILD_APPS || TARGET_BUILD_PDK R8_COMPAT_PROGUARD := $(HOST_OUT_EXECUTABLES)/r8-compat-proguard