Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit facdca17 authored by Colin Cross's avatar Colin Cross
Browse files

Update prebuilt build tools path 

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

Bug: 27857138
Change-Id: I60be42c197d420897dab77808c25818c9d2e81df
parent 2614bdb8

core/config.mk

+4 −2
Original line number Diff line number Diff line
@@ -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

core/ninja.mk

+1 −1
Original line number Diff line number Diff line 
NINJA ?= prebuilts/ninja/$(HOST_PREBUILT_TAG)/ninja

NINJA ?= prebuilts/build-tools/$(HOST_PREBUILT_TAG)/bin/ninja



include $(BUILD_SYSTEM)/soong.mk