commit f2b45aa676a154ddb3649e3b95d16f6b82392dec
author Andrew Hsieh <andrewhsieh@google.com> Thu Mar 22 11:06:34 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Mar 22 11:06:34 2012 -0700
tree c4a7ea4a1ae15d4c0d69381ad6c3d90459f34c87
parent 177a169cdc334981ca8c668fcfe412755eb8484e
parent 5d9aedef3067d458e356a6c13a26ad71041ff04b

am 5d9aedef: am 2245d17d: Point to new linux prebuilt toolchain for SDK build

* commit '5d9aedef3067d458e356a6c13a26ad71041ff04b':
  Point to new linux prebuilt toolchain for SDK build

core/combo/HOST_linux-x86.mk

diff --git a/core/combo/HOST_linux-x86.mk b/core/combo/HOST_linux-x86.mk
index 7df2893..1014f4b 100644
--- a/core/combo/HOST_linux-x86.mk
+++ b/core/combo/HOST_linux-x86.mk
@@ -33,13 +33,13 @@
 # LOCAL_CC and LOCAL_CXX to override this.
 #
 ifeq ($(TARGET_PRODUCT),sdk)
-HOST_SDK_TOOLCHAIN_PREFIX := prebuilt/linux-x86/toolchain/i686-linux-glibc2.7-4.4.3/bin/i686-linux
+HOST_SDK_TOOLCHAIN_PREFIX := prebuilts/tools/gcc-sdk
 # Don't do anything if the toolchain is not there
-ifneq (,$(strip $(wildcard $(HOST_SDK_TOOLCHAIN_PREFIX)-gcc)))
-HOST_CC  := $(HOST_SDK_TOOLCHAIN_PREFIX)-gcc
-HOST_CXX := $(HOST_SDK_TOOLCHAIN_PREFIX)-g++
-HOST_AR  := $(HOST_SDK_TOOLCHAIN_PREFIX)-ar
-endif # $(HOST_SDK_TOOLCHAIN_PREFIX)-gcc exists
+ifneq (,$(strip $(wildcard $(HOST_SDK_TOOLCHAIN_PREFIX)/gcc)))
+HOST_CC  := $(HOST_SDK_TOOLCHAIN_PREFIX)/gcc
+HOST_CXX := $(HOST_SDK_TOOLCHAIN_PREFIX)/g++
+HOST_AR  := $(HOST_SDK_TOOLCHAIN_PREFIX)/ar
+endif # $(HOST_SDK_TOOLCHAIN_PREFIX)/gcc exists
 endif # TARGET_PRODUCT == sdk
 
 # We build everything in 32-bit, because some host tools are