tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Update prebuilt build tools path"

Browse source
This commit is contained in:
Colin Cross 2016-05-05 18:54:37 +00:00 committed by Gerrit Code Review
commit 405b73ea10
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/config.mk
View file

@ -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

2
core/ninja.mk
View file

@ -1,4 +1,4 @@
NINJA ?= prebuilts/ninja/$(HOST_PREBUILT_TAG)/ninja
NINJA ?= prebuilts/build-tools/$(HOST_PREBUILT_TAG)/bin/ninja
include $(BUILD_SYSTEM)/soong.mk