commit 11a87113ef232c4f615a4c8df74dc28da17bec1e
author Colin Cross <ccross@android.com> Fri Jan 22 00:04:05 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Jan 22 00:04:05 2016 +0000
tree f05ad83d48fab7cd0b7b3af96f06df754a6e0184
parent 3ea04365dc39c14d458d69eb3954cbf099654681
parent 41ee5fc07adf81348a807c2de8d4460598a38fa4

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

* commit '41ee5fc07adf81348a807c2de8d4460598a38fa4':
  Set flag when using sdk tools in place

core/config.mk

diff --git a/core/config.mk b/core/config.mk
index 1af1995..34be76b 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -406,6 +406,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