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

Commit b3a68f6e authored by Ben Cheng's avatar Ben Cheng Committed by Android Git Automerger
Browse files

am 62f1d86e: Merge "Define TARGET_GCC_VERSION in target specific make files." 

* commit '62f1d86e':
  Define TARGET_GCC_VERSION in target specific make files.
parents 7c6658ea 62f1d86e

core/combo/TARGET_linux-arm.mk

+4 −0
Original line number Diff line number Diff line
@@ -34,6 +34,10 @@ ifeq ($(strip $(TARGET_ARCH_VARIANT)),) 
TARGET_ARCH_VARIANT := armv5te

endif



ifeq ($(strip $(TARGET_GCC_VERSION)),)

TARGET_GCC_VERSION := 4.6

endif



TARGET_ARCH_SPECIFIC_MAKEFILE := $(BUILD_COMBOS)/arch/$(TARGET_ARCH)/$(TARGET_ARCH_VARIANT).mk

ifeq ($(strip $(wildcard $(TARGET_ARCH_SPECIFIC_MAKEFILE))),)

$(error Unknown ARM architecture version: $(TARGET_ARCH_VARIANT))

core/combo/TARGET_linux-mips.mk

+4 −0
Original line number Diff line number Diff line
@@ -34,6 +34,10 @@ ifeq ($(strip $(TARGET_ARCH_VARIANT)),) 
TARGET_ARCH_VARIANT := mips32r2-fp

endif



ifeq ($(strip $(TARGET_GCC_VERSION)),)

TARGET_GCC_VERSION := 4.6

endif



TARGET_ARCH_SPECIFIC_MAKEFILE := $(BUILD_COMBOS)/arch/$(TARGET_ARCH)/$(TARGET_ARCH_VARIANT).mk

ifeq ($(strip $(wildcard $(TARGET_ARCH_SPECIFIC_MAKEFILE))),)

$(error Unknown MIPS architecture variant: $(TARGET_ARCH_VARIANT))

core/combo/TARGET_linux-x86.mk

+4 −0
Original line number Diff line number Diff line
@@ -22,6 +22,10 @@ ifeq ($(strip $(TARGET_ARCH_VARIANT)),) 
TARGET_ARCH_VARIANT := x86

endif



ifeq ($(strip $(TARGET_GCC_VERSION)),)

TARGET_GCC_VERSION := 4.6

endif



# Include the arch-variant-specific configuration file.

# Its role is to define various ARCH_X86_HAVE_XXX feature macros,

# plus initial values for TARGET_GLOBAL_CFLAGS

core/config.mk

+0 −5
Original line number Diff line number Diff line
@@ -225,11 +225,6 @@ ifeq ($(TARGET_CPU_ABI),) 
endif

TARGET_CPU_ABI2 := $(strip $(TARGET_CPU_ABI2))



# default target GCC version

ifeq ($(strip $(TARGET_GCC_VERSION)),)

TARGET_GCC_VERSION := 4.6

endif



# $(1): os/arch

define select-android-config-h

build/core/combo/include/arch/$(1)/AndroidConfig.h

envsetup.sh

+2 −2
Original line number Diff line number Diff line
@@ -124,11 +124,11 @@ function setpaths() 
    export ANDROID_EABI_TOOLCHAIN=

    local ARCH=$(get_build_var TARGET_ARCH)

    case $ARCH in

        x86) toolchaindir=x86/i686-linux-android-4.6/bin

        x86) toolchaindir=x86/i686-linux-android-$targetgccversion/bin

            ;;

        arm) toolchaindir=arm/arm-linux-androideabi-$targetgccversion/bin

            ;;

        mips) toolchaindir=mips/mipsel-linux-android-4.6/bin

        mips) toolchaindir=mips/mipsel-linux-android-$targetgccversion/bin

            ;;

        *)

            echo "Can't find toolchain for unknown architecture: $ARCH"