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

Commit 62855a83 authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru Committed by Android Git Automerger
Browse files

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

* commit '2436ea8a':
  Use i686-linux-android-4.6 for x86 build
parents cced446c 2436ea8a

core/combo/TARGET_linux-x86.mk

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

envsetup.sh

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

            ;;