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

Update prebuilt build tools path

Browse Source 
Build tools have been moved from prebuilts/sdk/tools to
prebuilts/build-tools.

Bug: 27857138
Change-Id: I60be42c197d420897dab77808c25818c9d2e81df
This commit is contained in:
Colin Cross
2016-04-19 15:32:22 -07:00
parent 2614bdb876
commit facdca17d5
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