tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

am fc8b6338: resolved conflicts for merge of d65a7da3 to jb-mr2-dev-plus-aosp

Browse source 
* commit 'fc8b6338510690f1f87c57b9d9c470e25fc48bcd':
  No need to filter out AndroidConfig.h for unbundled build
This commit is contained in:
Ying Wang 2013-08-15 14:34:09 -07:00 committed by Android Git Automerger
commit 3208b615c5
4 changed files with 19 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
core/binary.mk
View file

@ -154,21 +154,17 @@ LOCAL_ASFLAGS += -D__ASSEMBLY__
ifdef LOCAL_SDK_VERSION ifdef LOCAL_SDK_VERSION
my_target_project_includes := my_target_project_includes :=
my_target_c_includes := $(my_ndk_stl_include_path) $(my_ndk_version_root)/usr/include 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 else
my_target_project_includes := $(TARGET_PROJECT_INCLUDES) my_target_project_includes := $(TARGET_PROJECT_INCLUDES)
my_target_c_includes := $(TARGET_C_INCLUDES) my_target_c_includes := $(TARGET_C_INCLUDES)
ifeq ($(strip $(LOCAL_CLANG)),true) endif # LOCAL_SDK_VERSION
my_target_c_includes += $(CLANG_CONFIG_EXTRA_TARGET_C_INCLUDES)
ifeq ($(LOCAL_CLANG),true)
my_target_global_cflags := $(TARGET_GLOBAL_CLANG_FLAGS) my_target_global_cflags := $(TARGET_GLOBAL_CLANG_FLAGS)
my_target_c_includes += $(CLANG_CONFIG_EXTRA_TARGET_C_INCLUDES)
else else
my_target_global_cflags := $(TARGET_GLOBAL_CFLAGS) my_target_global_cflags := $(TARGET_GLOBAL_CFLAGS)
endif # LOCAL_CLANG endif # LOCAL_CLANG
endif # LOCAL_SDK_VERSION
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_TARGET_PROJECT_INCLUDES := $(my_target_project_includes) $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_TARGET_PROJECT_INCLUDES := $(my_target_project_includes)
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_TARGET_C_INCLUDES := $(my_target_c_includes) $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_TARGET_C_INCLUDES := $(my_target_c_includes)

10
core/combo/TARGET_linux-arm.mk
View file

@ -93,6 +93,8 @@ ifeq ($(FORCE_ARM_DEBUGGING),true)
TARGET_thumb_CFLAGS += -marm -fno-omit-frame-pointer TARGET_thumb_CFLAGS += -marm -fno-omit-frame-pointer
endif endif
android_config_h := $(call select-android-config-h,linux-arm)
TARGET_GLOBAL_CFLAGS += \ TARGET_GLOBAL_CFLAGS += \
-msoft-float -fpic -fPIE \ -msoft-float -fpic -fPIE \
-ffunction-sections \ -ffunction-sections \
@ -103,11 +105,9 @@ TARGET_GLOBAL_CFLAGS += \
-Werror=format-security \ -Werror=format-security \
-D_FORTIFY_SOURCE=2 \ -D_FORTIFY_SOURCE=2 \
-fno-short-enums \ -fno-short-enums \
$(arch_variant_cflags) $(arch_variant_cflags) \
-include $(android_config_h) \
android_config_h := $(call select-android-config-h,linux-arm) -I $(dir $(android_config_h))
TARGET_ANDROID_CONFIG_CFLAGS := -include $(android_config_h) -I $(dir $(android_config_h))
TARGET_GLOBAL_CFLAGS += $(TARGET_ANDROID_CONFIG_CFLAGS)
# This warning causes dalvik not to build with gcc 4.6+ and -Werror. # 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 # We cannot turn it off blindly since the option is not available

10
core/combo/TARGET_linux-mips.mk
View file

@ -80,6 +80,8 @@ ifeq ($(FORCE_MIPS_DEBUGGING),true)
TARGET_mips_CFLAGS += -fno-omit-frame-pointer TARGET_mips_CFLAGS += -fno-omit-frame-pointer
endif endif
android_config_h := $(call select-android-config-h,linux-mips)
TARGET_GLOBAL_CFLAGS += \ TARGET_GLOBAL_CFLAGS += \
$(TARGET_mips_CFLAGS) \ $(TARGET_mips_CFLAGS) \
-Ulinux -U__unix -U__unix__ -Umips \ -Ulinux -U__unix -U__unix__ -Umips \
@ -90,11 +92,9 @@ TARGET_GLOBAL_CFLAGS += \
-Wa,--noexecstack \ -Wa,--noexecstack \
-Werror=format-security \ -Werror=format-security \
-D_FORTIFY_SOURCE=2 \ -D_FORTIFY_SOURCE=2 \
$(arch_variant_cflags) $(arch_variant_cflags) \
-include $(android_config_h) \
android_config_h := $(call select-android-config-h,linux-mips) -I $(dir $(android_config_h))
TARGET_ANDROID_CONFIG_CFLAGS := -include $(android_config_h) -I $(dir $(android_config_h))
TARGET_GLOBAL_CFLAGS += $(TARGET_ANDROID_CONFIG_CFLAGS)
# This warning causes dalvik not to build with gcc 4.6+ and -Werror. # 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 # We cannot turn it off blindly since the option is not available

10
core/combo/TARGET_linux-x86.mk
View file

@ -85,6 +85,8 @@ else
endif endif
KERNEL_HEADERS := $(KERNEL_HEADERS_COMMON) $(KERNEL_HEADERS_ARCH) KERNEL_HEADERS := $(KERNEL_HEADERS_COMMON) $(KERNEL_HEADERS_ARCH)
android_config_h := $(call select-android-config-h,target_linux-x86)
TARGET_GLOBAL_CFLAGS += \ TARGET_GLOBAL_CFLAGS += \
-O2 \ -O2 \
-Ulinux \ -Ulinux \
@ -101,11 +103,9 @@ TARGET_GLOBAL_CFLAGS += \
-fstrict-aliasing \ -fstrict-aliasing \
-funswitch-loops \ -funswitch-loops \
-funwind-tables \ -funwind-tables \
-fstack-protector -fstack-protector \
-include $(android_config_h) \
android_config_h := $(call select-android-config-h,target_linux-x86) -I $(dir $(android_config_h))
TARGET_ANDROID_CONFIG_CFLAGS := -include $(android_config_h) -I $(dir $(android_config_h))
TARGET_GLOBAL_CFLAGS += $(TARGET_ANDROID_CONFIG_CFLAGS)
# XXX: Not sure this is still needed. Must check with our toolchains. # XXX: Not sure this is still needed. Must check with our toolchains.
TARGET_GLOBAL_CPPFLAGS += \ TARGET_GLOBAL_CPPFLAGS += \