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

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

Merge "Update prebuilt build tools path" am: 405b73ea 

am: f51ed402

* commit 'f51ed402':
  Update prebuilt build tools path

Change-Id: I99082fbc8427454265e50ae2ca4235f48c426761
parents 7b3407f8 f51ed402

core/config.mk

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

core/ninja.mk

+1 −1
Original line number Original line 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

include $(BUILD_SYSTEM)/soong.mk