Commit d3f3ab77 authored Jan 20, 2016 by Colin Cross

Set flag when using sdk tools in place

New version of build/ execute the tools from prebuilts/sdk/tools in
place, old versions copy them to $(HOST_OUT_EXECUTABLES).  build/ and
prebuilts/sdk often use mixed versions, set a flag that
prebuilts/sdk/tools/Android.mk can use to determine when it is using an
old build/ directory.

Change-Id: Iad2f96c35203fd3b0976946d229bfa8ab4acb150

parent c36a9760

core/config.mk

+2 −0

Original line number	Diff line number	Diff line
		@@ -406,6 +406,8 @@ BCC_COMPAT := $(HOST_OUT_EXECUTABLES)/bcc_compat
		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