diff options
| -rw-r--r-- | core/binary.mk | 12 | ||||
| -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 |
4 files changed, 19 insertions, 23 deletions
diff --git a/core/binary.mk b/core/binary.mk index 10d4927..e695567 100644 --- a/core/binary.mk +++ b/core/binary.mk @@ -141,21 +141,17 @@ LOCAL_ASFLAGS += -D__ASSEMBLY__ ifdef LOCAL_SDK_VERSION my_target_project_includes := my_target_c_includes := $(my_ndk_stl_include_path) $(my_ndk_version_root)/usr/include - -# filter out including of AndroidConfig.h in system/core. -TARGET_GLOBAL_CFLAGS_NO_ANDCONF ?= $(subst $(TARGET_ANDROID_CONFIG_CFLAGS),,\ - $(TARGET_GLOBAL_CFLAGS)) -my_target_global_cflags := $(TARGET_GLOBAL_CFLAGS_NO_ANDCONF) else my_target_project_includes := $(TARGET_PROJECT_INCLUDES) my_target_c_includes := $(TARGET_C_INCLUDES) -ifeq ($(strip $(LOCAL_CLANG)),true) -my_target_c_includes += $(CLANG_CONFIG_EXTRA_TARGET_C_INCLUDES) +endif # LOCAL_SDK_VERSION + +ifeq ($(LOCAL_CLANG),true) my_target_global_cflags := $(TARGET_GLOBAL_CLANG_FLAGS) +my_target_c_includes += $(CLANG_CONFIG_EXTRA_TARGET_C_INCLUDES) else my_target_global_cflags := $(TARGET_GLOBAL_CFLAGS) endif # LOCAL_CLANG -endif # LOCAL_SDK_VERSION $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_TARGET_PROJECT_INCLUDES := $(my_target_project_includes) $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_TARGET_C_INCLUDES := $(my_target_c_includes) 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 diff --git a/core/combo/TARGET_linux-mips.mk b/core/combo/TARGET_linux-mips.mk index 83fe657..73ed203 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=1 \ - $(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 04531b2..a4abcff 100644 --- a/core/combo/TARGET_linux-x86.mk +++ b/core/combo/TARGET_linux-x86.mk @@ -85,6 +85,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 \ @@ -101,11 +103,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 += \ |