diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2013-11-22 11:06:11 -0800 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2013-11-22 11:06:11 -0800 |
| commit | b9041a45b1f030d3e374420aa95e44f4c3029fb4 (patch) | |
| tree | 56bbc7436b582d73f12e42a292c7f4efa939b1e2 /core/combo/TARGET_linux-arm.mk | |
| parent | a59b8545cf1aa013cf87b9946e738e0add1f4536 (diff) | |
| parent | c73341006286c391ae4d268a77f5e008045d5308 (diff) | |
| download | build-b9041a45b1f030d3e374420aa95e44f4c3029fb4.zip build-b9041a45b1f030d3e374420aa95e44f4c3029fb4.tar.gz build-b9041a45b1f030d3e374420aa95e44f4c3029fb4.tar.bz2 | |
Merge commit 'c73341006286c391ae4d268a77f5e008045d5308' into HEAD
Change-Id: I4bf7d32d65e19dfa1f0533fdd3b2295c50b13005
Diffstat (limited to 'core/combo/TARGET_linux-arm.mk')
| -rw-r--r-- | core/combo/TARGET_linux-arm.mk | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/core/combo/TARGET_linux-arm.mk b/core/combo/TARGET_linux-arm.mk index d92e381..6fbb778 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)) # The "-Wunused-but-set-variable" option often breaks projects that enable # "-Wall -Werror" due to a commom idiom "ALOGV(mesg)" where ALOGV is turned |