StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update prebuilt build tools path"

Browse Source 
am: 405b73ea10

* commit '405b73ea10cbe4a4d47c300643171df8f5569665':
  Update prebuilt build tools path

Change-Id: I4bb1ab3f85f9f30fcb326b856cc96fe9f51c4926
This commit is contained in:
Colin Cross
2016-05-05 19:03:07 +00:00
committed by android-build-merger
parent 0206533827 405b73ea10
commit f51ed4020f
2 changed files with 5 additions and 3 deletions
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