From 402d7f3654cc3ad58b1df5d2ba12e908b57f861b Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Sun, 29 Apr 2012 07:34:54 -0700 Subject: [PATCH] Use i686-linux-android-4.6 for x86 build Change-Id: Ibbb0a899f147013503d6830bb93050c5ae588539 Author: "H.J. Lu" --- core/combo/TARGET_linux-x86.mk | 2 +- envsetup.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/combo/TARGET_linux-x86.mk b/core/combo/TARGET_linux-x86.mk index df5ebeea7a..94d19b3df7 100644 --- a/core/combo/TARGET_linux-x86.mk +++ b/core/combo/TARGET_linux-x86.mk @@ -25,7 +25,7 @@ endif # You can set TARGET_TOOLS_PREFIX to get gcc from somewhere else ifeq ($(strip $(TARGET_TOOLS_PREFIX)),) TARGET_TOOLS_PREFIX := \ - prebuilts/gcc/$(HOST_PREBUILT_TAG)/x86/i686-android-linux-4.4.3/bin/i686-android-linux- + prebuilts/gcc/$(HOST_PREBUILT_TAG)/x86/i686-linux-android-4.6/bin/i686-linux-android- endif TARGET_CC := $(TARGET_TOOLS_PREFIX)gcc$(HOST_EXECUTABLE_SUFFIX) diff --git a/envsetup.sh b/envsetup.sh index 609e1affbb..6ad4600ce4 100644 --- a/envsetup.sh +++ b/envsetup.sh @@ -117,7 +117,7 @@ function setpaths() # The gcc toolchain does not exists for windows/cygwin. In this case, do not reference it. export ANDROID_EABI_TOOLCHAIN= case $(get_build_var TARGET_ARCH) in - x86) toolchaindir=x86/i686-android-linux-4.4.3/bin + x86) toolchaindir=x86/i686-linux-android-4.6/bin ;; arm|*) toolchaindir=arm/arm-linux-androideabi-4.6/bin ;;