| commit | 41ee5fc07adf81348a807c2de8d4460598a38fa4 | [log] [tgz] |
|---|---|---|
| author | Colin Cross <ccross@android.com> | Thu Jan 21 23:36:26 2016 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Thu Jan 21 23:36:26 2016 +0000 |
| tree | 86289cc8b2a97619fb9f791bc5f5aba62fab8c36 | |
| parent | 27a1201989d782af30a30186a05448dbbe3304b8 [diff] | |
| parent | d3f3ab77fde914b38ea78d824e372065dbbec797 [diff] |
Merge "Set flag when using sdk tools in place"
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