Merge commit 'c73341006286c391ae4d268a77f5e008045d5308' into HEAD

[android-x86/build.git] / core / combo / TARGET_linux-arm.mk

diff --git a/core/combo/TARGET_linux-arm.mk b/core/combo/TARGET_linux-arm.mk
index d92e381..6fbb778 100644 (file)
--- 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