diff options
| author | Ying Wang <wangying@google.com> | 2013-08-15 14:42:57 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-08-15 14:42:57 -0700 |
| commit | 0634a437a35df3563ec25f720e64638464a5def6 (patch) | |
| tree | 0e54d80ea0cfbf14dcff4429f2ece7dcea684ff2 /core/combo | |
| parent | 461cac97962d4353311d14ad092ecbe44d3097b1 (diff) | |
| parent | 3208b615c5cde2b682c3bbbcd2bb064b14b57489 (diff) | |
| download | build-0634a437a35df3563ec25f720e64638464a5def6.zip build-0634a437a35df3563ec25f720e64638464a5def6.tar.gz build-0634a437a35df3563ec25f720e64638464a5def6.tar.bz2 | |
am 3208b615: am fc8b6338: resolved conflicts for merge of d65a7da3 to jb-mr2-dev-plus-aosp
* commit '3208b615c5cde2b682c3bbbcd2bb064b14b57489':
No need to filter out AndroidConfig.h for unbundled build
Diffstat (limited to 'core/combo')
| -rw-r--r-- | core/combo/TARGET_linux-arm.mk | 10 | ||||
| -rw-r--r-- | core/combo/TARGET_linux-mips.mk | 10 | ||||
| -rw-r--r-- | core/combo/TARGET_linux-x86.mk | 10 |
3 files changed, 15 insertions, 15 deletions
diff --git a/core/combo/TARGET_linux-arm.mk b/core/combo/TARGET_linux-arm.mk index c31fe59..79a2899 100644 --- a/core/combo/TARGET_linux-arm.mk +++ b/core/combo/TARGET_linux-arm.mk @@ -93,6 +93,8 @@ ifeq ($(FORCE_ARM_DEBUGGING),true) TARGET_thumb_CFLAGS += -marm -fno-omit-frame-pointer endif +android_config_h := $(call select-android-config-h,linux-arm) + TARGET_GLOBAL_CFLAGS += \ -msoft-float -fpic -fPIE \ -ffunction-sections \ @@ -103,11 +105,9 @@ TARGET_GLOBAL_CFLAGS += \ -Werror=format-security \ -D_FORTIFY_SOURCE=2 \ -fno-short-enums \ - $(arch_variant_cflags) - -android_config_h := $(call select-android-config-h,linux-arm) -TARGET_ANDROID_CONFIG_CFLAGS := -include $(android_config_h) -I $(dir $(android_config_h)) -TARGET_GLOBAL_CFLAGS += $(TARGET_ANDROID_CONFIG_CFLAGS) + $(arch_variant_cflags) \ + -include $(android_config_h) \ + -I $(dir $(android_config_h)) # 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 diff --git a/core/combo/TARGET_linux-mips.mk b/core/combo/TARGET_linux-mips.mk index de7ca5c..ba6e8cd 100644 --- a/core/combo/TARGET_linux-mips.mk +++ b/core/combo/TARGET_linux-mips.mk @@ -80,6 +80,8 @@ ifeq ($(FORCE_MIPS_DEBUGGING),true) TARGET_mips_CFLAGS += -fno-omit-frame-pointer endif +android_config_h := $(call select-android-config-h,linux-mips) + TARGET_GLOBAL_CFLAGS += \ $(TARGET_mips_CFLAGS) \ -Ulinux -U__unix -U__unix__ -Umips \ @@ -90,11 +92,9 @@ TARGET_GLOBAL_CFLAGS += \ -Wa,--noexecstack \ -Werror=format-security \ -D_FORTIFY_SOURCE=2 \ - $(arch_variant_cflags) - -android_config_h := $(call select-android-config-h,linux-mips) -TARGET_ANDROID_CONFIG_CFLAGS := -include $(android_config_h) -I $(dir $(android_config_h)) -TARGET_GLOBAL_CFLAGS += $(TARGET_ANDROID_CONFIG_CFLAGS) + $(arch_variant_cflags) \ + -include $(android_config_h) \ + -I $(dir $(android_config_h)) # 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 diff --git a/core/combo/TARGET_linux-x86.mk b/core/combo/TARGET_linux-x86.mk index 159fbe1..4e13797 100644 --- a/core/combo/TARGET_linux-x86.mk +++ b/core/combo/TARGET_linux-x86.mk @@ -115,6 +115,8 @@ else endif KERNEL_HEADERS := $(KERNEL_HEADERS_COMMON) $(KERNEL_HEADERS_ARCH) +android_config_h := $(call select-android-config-h,target_linux-x86) + TARGET_GLOBAL_CFLAGS += \ -O2 \ -Ulinux \ @@ -131,11 +133,9 @@ TARGET_GLOBAL_CFLAGS += \ -fstrict-aliasing \ -funswitch-loops \ -funwind-tables \ - -fstack-protector - -android_config_h := $(call select-android-config-h,target_linux-x86) -TARGET_ANDROID_CONFIG_CFLAGS := -include $(android_config_h) -I $(dir $(android_config_h)) -TARGET_GLOBAL_CFLAGS += $(TARGET_ANDROID_CONFIG_CFLAGS) + -fstack-protector \ + -include $(android_config_h) \ + -I $(dir $(android_config_h)) # XXX: Not sure this is still needed. Must check with our toolchains. TARGET_GLOBAL_CPPFLAGS += \ |