Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 405b73ea authored May 05, 2016 by Colin Cross Committed by Gerrit Code Review May 05, 2016

Merge "Update prebuilt build tools path"

parents c9778e33 facdca17

core/config.mk

+4 −2

Original line number	Diff line number	Diff line
		@@ -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

core/ninja.mk

+1 −1

Original line number	Diff line number	Diff line
		NINJA ?= prebuilts/ninja/$(HOST_PREBUILT_TAG)/ninja
		NINJA ?= prebuilts/build-tools/$(HOST_PREBUILT_TAG)/bin/ninja

		include $(BUILD_SYSTEM)/soong.mk