p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "Update prebuilt build tools path" am: 405b73ea10 

am: f51ed4020f

* commit 'f51ed4020fcabe9d7a8e7f72fb3852ff2871f0a1':
  Update prebuilt build tools path

Change-Id: I99082fbc8427454265e50ae2ca4235f48c426761
This commit is contained in:
Colin Cross 2016-05-05 19:07:28 +00:00 committed by android-build-merger
parent 7b3407f801 f51ed4020f
commit 5f1660ebf4
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

@ -481,8 +481,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