Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0634a437 authored by Ying Wang's avatar Ying Wang Committed by Android Git Automerger
Browse files

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

* commit '3208b615':
  No need to filter out AndroidConfig.h for unbundled build
parents 461cac97 3208b615

core/binary.mk

+4 −8
Original line number Diff line number Diff line
@@ -156,21 +156,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)

core/combo/TARGET_linux-arm.mk

+5 −5
Original line number Diff line number Diff line
@@ -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))



# 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

core/combo/TARGET_linux-mips.mk

+5 −5
Original line number Diff line number Diff line
@@ -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

core/combo/TARGET_linux-x86.mk

+5 −5
Original line number Diff line number Diff line
@@ -115,6 +115,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 \
@@ -131,11 +133,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 += \