commit 1398f9d30da32142122928eed68deb7595367e0e
author Colin Cross <ccross@android.com> Fri Jan 22 00:16:17 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Jan 22 00:16:17 2016 +0000
tree 861b8130c9ac876d3705ee4adfb0c5858ac34a53
parent b6459cc143a22c0638378af72747e867a76a774f
parent 11a87113ef232c4f615a4c8df74dc28da17bec1e

Merge "Set flag when using sdk tools in place" am: 41ee5fc07a
am: 11a87113ef

* commit '11a87113ef232c4f615a4c8df74dc28da17bec1e':
  Set flag when using sdk tools in place

core/config.mk

diff --git a/core/config.mk b/core/config.mk
index 66c8afb..e5de5e9 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -412,6 +412,8 @@
 DX := $(HOST_OUT_EXECUTABLES)/dx
 MAINDEXCLASSES := $(HOST_OUT_EXECUTABLES)/mainDexClasses
 
+USE_PREBUILT_SDK_TOOLS_IN_PLACE := true
+
 # Override the definitions above for unbundled and PDK builds
 ifneq (,$(TARGET_BUILD_APPS)$(filter true,$(TARGET_BUILD_PDK)))
 prebuilt_sdk_tools := prebuilts/sdk/tools