Merge "Add more support for GLOBAL_CONLYFLAGS." (4bad2d21) · Commits · e / os / android_build

core/binary.mk

+10 −1

Original line number	Diff line number	Diff line
		@@ -38,6 +38,7 @@ my_static_libraries := $(LOCAL_STATIC_LIBRARIES)
		my_whole_static_libraries := $(LOCAL_WHOLE_STATIC_LIBRARIES)
		my_shared_libraries := $(LOCAL_SHARED_LIBRARIES)
		my_cflags := $(LOCAL_CFLAGS)
		my_conlyflags := $(LOCAL_CONLYFLAGS)
		my_cppflags := $(LOCAL_CPPFLAGS)
		my_ldflags := $(LOCAL_LDFLAGS)
		my_ldlibs := $(LOCAL_LDLIBS)
		@@ -272,10 +273,12 @@ endif # LOCAL_SDK_VERSION

		ifeq ($(my_clang),true)
		my_target_global_cflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)CLANG_TARGET_GLOBAL_CFLAGS)
		my_target_global_conlyflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)CLANG_TARGET_GLOBAL_CONLYFLAGS)
		my_target_global_cppflags += $($(LOCAL_2ND_ARCH_VAR_PREFIX)CLANG_TARGET_GLOBAL_CPPFLAGS)
		my_target_global_ldflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)CLANG_TARGET_GLOBAL_LDFLAGS)
		else
		my_target_global_cflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_GLOBAL_CFLAGS)
		my_target_global_conlyflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_GLOBAL_CONLYFLAGS)
		my_target_global_cppflags += $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_GLOBAL_CPPFLAGS)
		my_target_global_ldflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_GLOBAL_LDFLAGS)
		endif # my_clang
		@@ -310,6 +313,7 @@ endif
		$(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_GLOBAL_CFLAGS := $(my_target_global_cflags)
		$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_TARGET_GLOBAL_CONLYFLAGS := $(my_target_global_conlyflags)
		$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_TARGET_GLOBAL_CPPFLAGS := $(my_target_global_cppflags)
		$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_TARGET_GLOBAL_LDFLAGS := $(my_target_global_ldflags)

		@@ -317,11 +321,13 @@ else # LOCAL_IS_HOST_MODULE

		ifeq ($(my_clang),true)
		my_host_global_cflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)CLANG_HOST_GLOBAL_CFLAGS)
		my_host_global_conlyflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)CLANG_HOST_GLOBAL_CONLYFLAGS)
		my_host_global_cppflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)CLANG_HOST_GLOBAL_CPPFLAGS)
		my_host_global_ldflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)CLANG_HOST_GLOBAL_LDFLAGS)
		my_host_c_includes := $($(LOCAL_2ND_ARCH_VAR_PREFIX)HOST_C_INCLUDES)
		else
		my_host_global_cflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)HOST_GLOBAL_CFLAGS)
		my_host_global_conlyflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)HOST_GLOBAL_CONLYFLAGS)
		my_host_global_cppflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)HOST_GLOBAL_CPPFLAGS)
		my_host_global_ldflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)HOST_GLOBAL_LDFLAGS)
		my_host_c_includes := $($(LOCAL_2ND_ARCH_VAR_PREFIX)HOST_C_INCLUDES)
		@@ -329,6 +335,7 @@ endif # my_clang

		$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_HOST_C_INCLUDES := $(my_host_c_includes)
		$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_HOST_GLOBAL_CFLAGS := $(my_host_global_cflags)
		$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_HOST_GLOBAL_CONLYFLAGS := $(my_host_global_conlyflags)
		$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_HOST_GLOBAL_CPPFLAGS := $(my_host_global_cppflags)
		$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_HOST_GLOBAL_LDFLAGS := $(my_host_global_ldflags)
		endif # LOCAL_IS_HOST_MODULE
		@@ -984,10 +991,12 @@ endif

		ifeq ($(my_clang),true)
		my_cflags += $(LOCAL_CLANG_CFLAGS)
		my_conlyflags += $(LOCAL_CLANG_CONLYFLAGS)
		my_cppflags += $(LOCAL_CLANG_CPPFLAGS)
		my_asflags += $(LOCAL_CLANG_ASFLAGS)
		my_ldflags += $(LOCAL_CLANG_LDFLAGS)
		my_cflags += $(LOCAL_CLANG_CFLAGS_$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) $(LOCAL_CLANG_CFLAGS_$(my_32_64_bit_suffix))
		my_conlyflags += $(LOCAL_CLANG_CONLYFLAGS_$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) $(LOCAL_CLANG_CONLYFLAGS_$(my_32_64_bit_suffix))
		my_cppflags += $(LOCAL_CLANG_CPPFLAGS_$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) $(LOCAL_CLANG_CPPFLAGS_$(my_32_64_bit_suffix))
		my_ldflags += $(LOCAL_CLANG_LDFLAGS_$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) $(LOCAL_CLANG_LDFLAGS_$(my_32_64_bit_suffix))
		my_asflags += $(LOCAL_CLANG_ASFLAGS_$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) $(LOCAL_CLANG_ASFLAGS_$(my_32_64_bit_suffix))
		@@ -999,7 +1008,7 @@ endif

		$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_YACCFLAGS := $(LOCAL_YACCFLAGS)
		$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_ASFLAGS := $(my_asflags)
		$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_CONLYFLAGS := $(LOCAL_CONLYFLAGS)
		$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_CONLYFLAGS := $(my_conlyflags)
		$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_CFLAGS := $(my_cflags)
		$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_CPPFLAGS := $(my_cppflags)
		$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_RTTI_FLAG := $(LOCAL_RTTI_FLAG)

core/clang/HOST_x86.mk

+10 −0

Original line number	Diff line number	Diff line
		@@ -34,6 +34,12 @@ CLANG_CONFIG_x86_HOST_EXTRA_CFLAGS := \
		$(CLANG_CONFIG_x86_HOST_COMBO_EXTRA_CFLAGS) \
		$(CLANG_CONFIG_x86_HOST_EXTRA_ASFLAGS)

		CLANG_CONFIG_x86_HOST_EXTRA_CONLYFLAGS := \
		$(CLANG_CONFIG_EXTRA_CONLYFLAGS) \
		$(CLANG_CONFIG_HOST_EXTRA_CONLYFLAGS) \
		$(CLANG_CONFIG_x86_EXTRA_CONLYFLAGS) \
		$(CLANG_CONFIG_x86_HOST_COMBO_EXTRA_CONLYFLAGS)

		CLANG_CONFIG_x86_HOST_EXTRA_CPPFLAGS := \
		$(CLANG_CONFIG_EXTRA_CPPFLAGS) \
		$(CLANG_CONFIG_HOST_EXTRA_CPPFLAGS) \
		@@ -59,6 +65,10 @@ $(clang_2nd_arch_prefix)CLANG_HOST_GLOBAL_CFLAGS := \
		$(call $(clang_2nd_arch_prefix)convert-to-host-clang-flags,$($(clang_2nd_arch_prefix)HOST_GLOBAL_CFLAGS)) \
		$(CLANG_CONFIG_x86_HOST_EXTRA_CFLAGS)

		$(clang_2nd_arch_prefix)CLANG_HOST_GLOBAL_CONLYFLAGS := \
		$(call $(clang_2nd_arch_prefix)convert-to-host-clang-flags,$($(clang_2nd_arch_prefix)HOST_GLOBAL_CONLYFLAGS)) \
		$(CLANG_CONFIG_x86_HOST_EXTRA_CONLYFLAGS)

		$(clang_2nd_arch_prefix)CLANG_HOST_GLOBAL_CPPFLAGS := \
		$(call $(clang_2nd_arch_prefix)convert-to-host-clang-flags,$($(clang_2nd_arch_prefix)HOST_GLOBAL_CPPFLAGS)) \
		$(CLANG_CONFIG_x86_HOST_EXTRA_CPPFLAGS)

core/clang/HOST_x86_64.mk

+10 −0

Original line number	Diff line number	Diff line
		@@ -34,6 +34,12 @@ CLANG_CONFIG_x86_64_HOST_EXTRA_CFLAGS := \
		$(CLANG_CONFIG_x86_64_HOST_COMBO_EXTRA_CFLAGS) \
		$(CLANG_CONFIG_x86_64_HOST_EXTRA_ASFLAGS)

		CLANG_CONFIG_x86_64_HOST_EXTRA_CONLYFLAGS := \
		$(CLANG_CONFIG_EXTRA_CONLYFLAGS) \
		$(CLANG_CONFIG_HOST_EXTRA_CONLYFLAGS) \
		$(CLANG_CONFIG_x86_64_EXTRA_CONLYFLAGS) \
		$(CLANG_CONFIG_x86_64_HOST_COMBO_EXTRA_CONLYFLAGS)

		CLANG_CONFIG_x86_64_HOST_EXTRA_CPPFLAGS := \
		$(CLANG_CONFIG_EXTRA_CPPFLAGS) \
		$(CLANG_CONFIG_HOST_EXTRA_CPPFLAGS) \
		@@ -59,6 +65,10 @@ CLANG_HOST_GLOBAL_CFLAGS := \
		$(call convert-to-host-clang-flags,$(HOST_GLOBAL_CFLAGS)) \
		$(CLANG_CONFIG_x86_64_HOST_EXTRA_CFLAGS)

		CLANG_HOST_GLOBAL_CONLYFLAGS := \
		$(call convert-to-host-clang-flags,$(HOST_GLOBAL_CONLYFLAGS)) \
		$(CLANG_CONFIG_x86_64_HOST_EXTRA_CONLYFLAGS)

		CLANG_HOST_GLOBAL_CPPFLAGS := \
		$(call convert-to-host-clang-flags,$(HOST_GLOBAL_CPPFLAGS)) \
		$(CLANG_CONFIG_x86_64_HOST_EXTRA_CPPFLAGS)

core/clang/TARGET_arm.mk

+9 −0

Original line number	Diff line number	Diff line
		@@ -19,6 +19,11 @@ CLANG_CONFIG_arm_TARGET_EXTRA_CFLAGS := \
		-target $(CLANG_CONFIG_arm_TARGET_TRIPLE) \
		$(CLANG_CONFIG_arm_TARGET_EXTRA_ASFLAGS)

		CLANG_CONFIG_arm_TARGET_EXTRA_CONLYFLAGS := \
		$(CLANG_CONFIG_EXTRA_CONLYFLAGS) \
		$(CLANG_CONFIG_TARGET_EXTRA_CONLYFLAGS) \
		$(CLANG_CONFIG_arm_EXTRA_CONLYFLAGS)

		CLANG_CONFIG_arm_TARGET_EXTRA_CPPFLAGS := \
		$(CLANG_CONFIG_EXTRA_CPPFLAGS) \
		$(CLANG_CONFIG_TARGET_EXTRA_CPPFLAGS) \
		@@ -44,6 +49,10 @@ $(clang_2nd_arch_prefix)CLANG_TARGET_GLOBAL_CFLAGS := \
		$(call $(clang_2nd_arch_prefix)convert-to-clang-flags,$($(clang_2nd_arch_prefix)TARGET_GLOBAL_CFLAGS)) \
		$(CLANG_CONFIG_arm_TARGET_EXTRA_CFLAGS)

		$(clang_2nd_arch_prefix)CLANG_TARGET_GLOBAL_CONLYFLAGS := \
		$(call $(clang_2nd_arch_prefix)convert-to-clang-flags,$($(clang_2nd_arch_prefix)TARGET_GLOBAL_CONLYFLAGS)) \
		$(CLANG_CONFIG_arm_TARGET_EXTRA_CONLYFLAGS)

		$(clang_2nd_arch_prefix)CLANG_TARGET_GLOBAL_CPPFLAGS := \
		$(call $(clang_2nd_arch_prefix)convert-to-clang-flags,$($(clang_2nd_arch_prefix)TARGET_GLOBAL_CPPFLAGS)) \
		$(CLANG_CONFIG_arm_TARGET_EXTRA_CPPFLAGS)

core/clang/TARGET_arm64.mk

+9 −0

Original line number	Diff line number	Diff line
		@@ -18,6 +18,11 @@ CLANG_CONFIG_arm64_TARGET_EXTRA_CFLAGS := \
		$(CLANG_CONFIG_arm64_EXTRA_CFLAGS) \
		$(CLANG_CONFIG_arm64_TARGET_EXTRA_ASFLAGS)

		CLANG_CONFIG_arm64_TARGET_EXTRA_CONLYFLAGS := \
		$(CLANG_CONFIG_EXTRA_CONLYFLAGS) \
		$(CLANG_CONFIG_TARGET_EXTRA_CONLYFLAGS) \
		$(CLANG_CONFIG_arm64_EXTRA_CONLYFLAGS)

		CLANG_CONFIG_arm64_TARGET_EXTRA_CPPFLAGS := \
		$(CLANG_CONFIG_EXTRA_CPPFLAGS) \
		$(CLANG_CONFIG_TARGET_EXTRA_CPPFLAGS) \
		@@ -42,6 +47,10 @@ CLANG_TARGET_GLOBAL_CFLAGS := \
		$(call convert-to-clang-flags,$(TARGET_GLOBAL_CFLAGS)) \
		$(CLANG_CONFIG_arm64_TARGET_EXTRA_CFLAGS)

		CLANG_TARGET_GLOBAL_CONLYFLAGS := \
		$(call convert-to-clang-flags,$(TARGET_GLOBAL_CONLYFLAGS)) \
		$(CLANG_CONFIG_arm64_TARGET_EXTRA_CONLYFLAGS)

		CLANG_TARGET_GLOBAL_CPPFLAGS := \
		$(call convert-to-clang-flags,$(TARGET_GLOBAL_CPPFLAGS)) \
		$(CLANG_CONFIG_arm64_TARGET_EXTRA_CPPFLAGS)