Merge commit 'c73341006286c391ae4d268a77f5e008045d5308' into HEAD

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

diff --git a/core/combo/TARGET_linux-mips.mk b/core/combo/TARGET_linux-mips.mk
index 7e43faa..99ea022 100644 (file)
--- 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