From facdca17d5a9a3772ce1f1a672e06881d19bea02 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Tue, 19 Apr 2016 15:32:22 -0700 Subject: [PATCH] Update prebuilt build tools path Build tools have been moved from prebuilts/sdk/tools to prebuilts/build-tools. Bug: 27857138 Change-Id: I60be42c197d420897dab77808c25818c9d2e81df --- core/config.mk | 6 ++++-- core/ninja.mk | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/core/config.mk b/core/config.mk index 15d8fde192..516fec8fb7 100644 --- a/core/config.mk +++ b/core/config.mk @@ -474,8 +474,10 @@ DX := $(HOST_OUT_EXECUTABLES)/dx MAINDEXCLASSES := $(HOST_OUT_EXECUTABLES)/mainDexClasses # Always use prebuilts for ckati and makeparallel -CKATI := $(prebuilt_sdk_tools_bin)/ckati -MAKEPARALLEL := $(prebuilt_sdk_tools_bin)/makeparallel +prebuilt_build_tools := prebuilts/build-tools +prebuilt_build_tools_bin := $(prebuilt_build_tools)/$(HOST_PREBUILT_TAG)/bin +CKATI := $(prebuilt_build_tools_bin)/ckati +MAKEPARALLEL := $(prebuilt_build_tools_bin)/makeparallel USE_PREBUILT_SDK_TOOLS_IN_PLACE := true diff --git a/core/ninja.mk b/core/ninja.mk index f5d9c89a3c..8a94f39355 100644 --- a/core/ninja.mk +++ b/core/ninja.mk @@ -1,4 +1,4 @@ -NINJA ?= prebuilts/ninja/$(HOST_PREBUILT_TAG)/ninja +NINJA ?= prebuilts/build-tools/$(HOST_PREBUILT_TAG)/bin/ninja include $(BUILD_SYSTEM)/soong.mk