Add local Clang+target specific flags. (619fdb8d) · Commits · e / os / android_build

core/binary.mk

+4 −0

Original line number	Diff line number	Diff line
		@@ -1013,6 +1013,10 @@ my_cflags += $(LOCAL_CLANG_CFLAGS)
		my_cpplags += $(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_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))
		my_cflags := $(call $(LOCAL_2ND_ARCH_VAR_PREFIX)convert-to-$(my_host)clang-flags,$(my_cflags))
		my_cppflags := $(call $(LOCAL_2ND_ARCH_VAR_PREFIX)convert-to-$(my_host)clang-flags,$(my_cppflags))
		my_asflags := $(call $(LOCAL_2ND_ARCH_VAR_PREFIX)convert-to-$(my_host)clang-flags,$(my_asflags))

core/clear_vars.mk

+16 −0

Original line number	Diff line number	Diff line
		@@ -163,11 +163,15 @@ LOCAL_NATIVE_COVERAGE :=
		# arch specific variables
		LOCAL_SRC_FILES_$(TARGET_ARCH):=
		LOCAL_CFLAGS_$(TARGET_ARCH):=
		LOCAL_CLANG_CFLAGS_$(TARGET_ARCH):=
		LOCAL_CPPFLAGS_$(TARGET_ARCH):=
		LOCAL_CLANG_CPPFLAGS_$(TARGET_ARCH):=
		LOCAL_C_INCLUDES_$(TARGET_ARCH):=
		LOCAL_ASFLAGS_$(TARGET_ARCH):=
		LOCAL_CLANG_ASFLAGS_$(TARGET_ARCH):=
		LOCAL_NO_CRT_$(TARGET_ARCH):=
		LOCAL_LDFLAGS_$(TARGET_ARCH):=
		LOCAL_CLANG_LDFLAGS_$(TARGET_ARCH):=
		LOCAL_SHARED_LIBRARIES_$(TARGET_ARCH):=
		LOCAL_STATIC_LIBRARIES_$(TARGET_ARCH):=
		LOCAL_WHOLE_STATIC_LIBRARIES_$(TARGET_ARCH):=
		@@ -178,11 +182,15 @@ LOCAL_PREBUILT_JNI_LIBS_$(TARGET_ARCH):=
		ifdef TARGET_2ND_ARCH
		LOCAL_SRC_FILES_$(TARGET_2ND_ARCH):=
		LOCAL_CFLAGS_$(TARGET_2ND_ARCH):=
		LOCAL_CLANG_CFLAGS_$(TARGET_2ND_ARCH):=
		LOCAL_CPPFLAGS_$(TARGET_2ND_ARCH):=
		LOCAL_CLANG_CPPFLAGS_$(TARGET_2ND_ARCH):=
		LOCAL_C_INCLUDES_$(TARGET_2ND_ARCH):=
		LOCAL_ASFLAGS_$(TARGET_2ND_ARCH):=
		LOCAL_CLANG_ASFLAGS_$(TARGET_2ND_ARCH):=
		LOCAL_NO_CRT_$(TARGET_2ND_ARCH):=
		LOCAL_LDFLAGS_$(TARGET_2ND_ARCH):=
		LOCAL_CLANG_LDFLAGS_$(TARGET_2ND_ARCH):=
		LOCAL_SHARED_LIBRARIES_$(TARGET_2ND_ARCH):=
		LOCAL_STATIC_LIBRARIES_$(TARGET_2ND_ARCH):=
		LOCAL_WHOLE_STATIC_LIBRARIES_$(TARGET_2ND_ARCH):=
		@@ -238,6 +246,14 @@ LOCAL_LDFLAGS_32:=
		LOCAL_LDFLAGS_64:=
		LOCAL_ASFLAGS_32:=
		LOCAL_ASFLAGS_64:=
		LOCAL_CLANG_CFLAGS_32:=
		LOCAL_CLANG_CFLAGS_64:=
		LOCAL_CLANG_CPPFLAGS_32:=
		LOCAL_CLANG_CPPFLAGS_64:=
		LOCAL_CLANG_LDFLAGS_32:=
		LOCAL_CLANG_LDFLAGS_64:=
		LOCAL_CLANG_ASFLAGS_32:=
		LOCAL_CLANG_ASFLAGS_64:=
		LOCAL_C_INCLUDES_32:=
		LOCAL_C_INCLUDES_64:=
		LOCAL_MODULE_PATH_32:=