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

Commit f51ed402 authored by Colin Cross's avatar Colin Cross Committed by android-build-merger
Browse files

Merge "Update prebuilt build tools path" 

am: 405b73ea

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

Change-Id: I4bb1ab3f85f9f30fcb326b856cc96fe9f51c4926
parents 02065338 405b73ea

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