commit 97a2cf59e12b99d775c3376316d350acd9e9c4dd
author Dan Albert <danalbert@google.com> Thu Feb 04 21:46:16 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Feb 04 21:46:16 2016 +0000
tree 6433ba8f1ca2ce8cf6a472bfb2179f43016274b9
parent 117dcbaaa9c4fe7b3a79b3887022d22e8f9df818
parent 678ff8fb270b8cca16f6ee9efea19365660a5498

Merge "Fix HOST_TOOLS_ROOT."

build/core/init.mk

diff --git a/build/core/init.mk b/build/core/init.mk
index cec6b03..2d30cac 100644
--- a/build/core/init.mk
+++ b/build/core/init.mk
@@ -306,7 +306,7 @@
 $(call ndk_log,HOST_TAG set to $(HOST_TAG))
 
 # Check for NDK-specific versions of our host tools
-HOST_TOOLS_ROOT := $(NDK_ROOT)/host-tools
+HOST_TOOLS_ROOT := $(NDK_ROOT)/prebuilt/$(HOST_TAG64)
 HOST_PREBUILT := $(strip $(wildcard $(HOST_TOOLS_ROOT)/bin))
 HOST_AWK := $(strip $(NDK_HOST_AWK))
 HOST_MAKE := $(strip $(NDK_HOST_MAKE))