p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am 2436ea8a: Merge "Use i686-linux-android-4.6 for x86 build" 

* commit '2436ea8a8c84d58befb4bf27d137d94c45b8cc8d':
  Use i686-linux-android-4.6 for x86 build
This commit is contained in:
Jean-Baptiste Queru 2012-05-16 07:55:00 -07:00 committed by Android Git Automerger
parent cced446c7f 2436ea8a8c
commit 62855a83b8
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/combo/TARGET_linux-x86.mk
View File

@ -25,7 +25,7 @@ endif
# You can set TARGET_TOOLS_PREFIX to get gcc from somewhere else # You can set TARGET_TOOLS_PREFIX to get gcc from somewhere else
ifeq ($(strip $(TARGET_TOOLS_PREFIX)),) ifeq ($(strip $(TARGET_TOOLS_PREFIX)),)
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 endif
TARGET_CC := $(TARGET_TOOLS_PREFIX)gcc$(HOST_EXECUTABLE_SUFFIX) TARGET_CC := $(TARGET_TOOLS_PREFIX)gcc$(HOST_EXECUTABLE_SUFFIX)

2
envsetup.sh
View File

@ -117,7 +117,7 @@ function setpaths()
# The gcc toolchain does not exists for windows/cygwin. In this case, do not reference it. # The gcc toolchain does not exists for windows/cygwin. In this case, do not reference it.
export ANDROID_EABI_TOOLCHAIN= export ANDROID_EABI_TOOLCHAIN=
case $(get_build_var TARGET_ARCH) in 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 arm|*) toolchaindir=arm/arm-linux-androideabi-4.6/bin
;; ;;