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

Commit 7176e801 authored by Andrew Hsieh's avatar Andrew Hsieh Committed by Gerrit Code Review
Browse files

Merge "Add TARGET_GCC_VERSION"

parents d883749e 06b63bae

core/combo/TARGET_linux-arm.mk

+3 −3
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ include $(TARGET_ARCH_SPECIFIC_MAKEFILE) 


# You can set TARGET_TOOLS_PREFIX to get gcc from somewhere else

ifeq ($(strip $(TARGET_TOOLS_PREFIX)),)

TARGET_TOOLCHAIN_ROOT := prebuilts/gcc/$(HOST_PREBUILT_TAG)/arm/arm-linux-androideabi-4.6

TARGET_TOOLCHAIN_ROOT := prebuilts/gcc/$(HOST_PREBUILT_TAG)/arm/arm-linux-androideabi-$(TARGET_GCC_VERSION)

TARGET_TOOLS_PREFIX := $(TARGET_TOOLCHAIN_ROOT)/bin/arm-linux-androideabi-

endif
@@ -114,11 +114,11 @@ TARGET_GLOBAL_CFLAGS += \ 
			-include $(android_config_h) \

			-I $(arch_include_dir)



# This warning causes dalvik not to build with gcc 4.6.x and -Werror.

# This warning causes dalvik not to build with gcc 4.6+ and -Werror.

# We cannot turn it off blindly since the option is not available

# in gcc-4.4.x.  We also want to disable sincos optimization globally

# by turning off the builtin sin function.

ifneq ($(filter 4.6 4.6.%, $(shell $(TARGET_CC) --version)),)

ifneq ($(filter 4.6 4.6.% 4.7 4.7.%, $(shell $(TARGET_CC) --version)),)

TARGET_GLOBAL_CFLAGS += -Wno-unused-but-set-variable -fno-builtin-sin \

			-fno-strict-volatile-bitfields

endif

core/combo/TARGET_linux-mips.mk

+3 −3
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ include $(TARGET_ARCH_SPECIFIC_MAKEFILE) 


# You can set TARGET_TOOLS_PREFIX to get gcc from somewhere else

ifeq ($(strip $(TARGET_TOOLS_PREFIX)),)

TARGET_TOOLCHAIN_ROOT := prebuilts/gcc/$(HOST_PREBUILT_TAG)/mips/mipsel-linux-android-4.6

TARGET_TOOLCHAIN_ROOT := prebuilts/gcc/$(HOST_PREBUILT_TAG)/mips/mipsel-linux-android-$(TARGET_GCC_VERSION)

TARGET_TOOLS_PREFIX := $(TARGET_TOOLCHAIN_ROOT)/bin/mipsel-linux-android-

endif
@@ -93,10 +93,10 @@ TARGET_GLOBAL_CFLAGS += \ 
			-include $(android_config_h) \

			-I $(arch_include_dir)



# This warning causes dalvik not to build with gcc 4.6.x and -Werror.

# This warning causes dalvik not to build with gcc 4.6+ and -Werror.

# We cannot turn it off blindly since the option is not available

# in gcc-4.4.x.

ifneq ($(filter 4.6 4.6.%, $(shell $(TARGET_CC) --version)),)

ifneq ($(filter 4.6 4.6.% 4.7 4.7.%, $(shell $(TARGET_CC) --version)),)

TARGET_GLOBAL_CFLAGS += -Wno-unused-but-set-variable \

                        -fno-strict-volatile-bitfields

endif

core/combo/TARGET_linux-x86.mk

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ include $(TARGET_ARCH_SPECIFIC_MAKEFILE) 


# You can set TARGET_TOOLS_PREFIX to get gcc from somewhere else

ifeq ($(strip $(TARGET_TOOLS_PREFIX)),)

TARGET_TOOLCHAIN_ROOT := prebuilts/gcc/$(HOST_PREBUILT_TAG)/x86/i686-linux-android-4.6

TARGET_TOOLCHAIN_ROOT := prebuilts/gcc/$(HOST_PREBUILT_TAG)/x86/i686-linux-android-$(TARGET_GCC_VERSION)

TARGET_TOOLS_PREFIX := $(TARGET_TOOLCHAIN_ROOT)/bin/i686-linux-android-

endif

core/config.mk

+5 −0
Original line number Diff line number Diff line
@@ -225,6 +225,11 @@ 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

system/core/include/arch/$(1)/AndroidConfig.h

core/dumpvar.mk

+6 −6
Original line number Diff line number Diff line
@@ -11,23 +11,23 @@ endif 


# Add the ARM toolchain bin dir if it actually exists

ifeq ($(TARGET_ARCH),arm)

    ifneq ($(wildcard $(PWD)/prebuilts/gcc/$(HOST_PREBUILT_TAG)/arm/arm-linux-androideabi-4.6/bin),)

    ifneq ($(wildcard $(PWD)/prebuilts/gcc/$(HOST_PREBUILT_TAG)/arm/arm-linux-androideabi-$(TARGET_GCC_VERSION)/bin),)

        # this should be copied to HOST_OUT_EXECUTABLES instead

        ABP:=$(ABP):$(PWD)/prebuilts/gcc/$(HOST_PREBUILT_TAG)/arm/arm-linux-androideabi-4.6/bin

        ABP:=$(ABP):$(PWD)/prebuilts/gcc/$(HOST_PREBUILT_TAG)/arm/arm-linux-androideabi-$(TARGET_GCC_VERSION)/bin

    endif

else ifeq ($(TARGET_ARCH),x86)



# Add the x86 toolchain bin dir if it actually exists

    ifneq ($(wildcard $(PWD)/prebuilts/gcc/$(HOST_PREBUILT_TAG)/x86/i686-linux-android-4.6/bin),)

    ifneq ($(wildcard $(PWD)/prebuilts/gcc/$(HOST_PREBUILT_TAG)/x86/i686-linux-android-$(TARGET_GCC_VERSION)/bin),)

        # this should be copied to HOST_OUT_EXECUTABLES instead

        ABP:=$(ABP):$(PWD)/prebuilts/gcc/$(HOST_PREBUILT_TAG)/x86/i686-linux-android-4.6/bin

        ABP:=$(ABP):$(PWD)/prebuilts/gcc/$(HOST_PREBUILT_TAG)/x86/i686-linux-android-$(TARGET_GCC_VERSION)/bin

    endif

endif



# Add the mips toolchain bin dir if it actually exists

ifneq ($(wildcard $(PWD)/prebuilts/gcc/$(HOST_PREBUILT_TAG)/mips/mipsel-linux-android-4.6/bin),)

ifneq ($(wildcard $(PWD)/prebuilts/gcc/$(HOST_PREBUILT_TAG)/mips/mipsel-linux-android-$(TARGET_GCC_VERSION)/bin),)

    # this should be copied to HOST_OUT_EXECUTABLES instead

    ABP:=$(ABP):$(PWD)/prebuilts/gcc/$(HOST_PREBUILT_TAG)/mips/mipsel-linux-android-4.6/bin

    ABP:=$(ABP):$(PWD)/prebuilts/gcc/$(HOST_PREBUILT_TAG)/mips/mipsel-linux-android-$(TARGET_GCC_VERSION)/bin

endif



ANDROID_BUILD_PATHS := $(ABP)