diff options
| author | Ying Wang <wangying@google.com> | 2013-08-15 11:01:10 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2013-08-15 11:01:10 -0700 |
| commit | f4723fa49b6e61f727b6321a4006ee8ba3f393b9 (patch) | |
| tree | d1726081a3a4c8729fcbbc6deeafe46659a830a2 /core/combo/TARGET_linux-arm.mk | |
| parent | e391e7a86e806bd3d2549b6d12736166fafb746f (diff) | |
| download | build-f4723fa49b6e61f727b6321a4006ee8ba3f393b9.zip build-f4723fa49b6e61f727b6321a4006ee8ba3f393b9.tar.gz build-f4723fa49b6e61f727b6321a4006ee8ba3f393b9.tar.bz2 | |
No need to filter out AndroidConfig.h for unbundled build
for now we have all AndroidConfig.hs in the build project.
Change-Id: Id713fecba1378fad81688f5937f61c779b618ac2
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 371ba96..e3e6841 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=1 \ -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 |