openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge "Update prebuilt build tools path"

This commit is contained in:
Colin Cross 2016-05-05 18:54:37 +00:00 committed by Gerrit Code Review
parent c9778e339d facdca17d5
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 MAINDEXCLASSES := $(HOST_OUT_EXECUTABLES)/mainDexClasses
# Always use prebuilts for ckati and makeparallel # Always use prebuilts for ckati and makeparallel
CKATI := $(prebuilt_sdk_tools_bin)/ckati prebuilt_build_tools := prebuilts/build-tools
MAKEPARALLEL := $(prebuilt_sdk_tools_bin)/makeparallel 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 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 include $(BUILD_SYSTEM)/soong.mk