Merge "Add USE_CLANG_LLD and LOCAL_USE_CLANG_LLD" (a72e1518) · Commits · e / os / android_build

core/binary.mk

+6 −1

core/clear_vars.mk

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -264,6 +264,7 @@ LOCAL_TIDY_FLAGS:=
	LOCAL_UNINSTALLABLE_MODULE:=		LOCAL_UNINSTALLABLE_MODULE:=
	LOCAL_UNSTRIPPED_PATH:=		LOCAL_UNSTRIPPED_PATH:=
	LOCAL_USE_AAPT2:=$(USE_AAPT2)		LOCAL_USE_AAPT2:=$(USE_AAPT2)
			LOCAL_USE_CLANG_LLD:=
	LOCAL_USE_R8:=		LOCAL_USE_R8:=
	LOCAL_USE_VNDK:=		LOCAL_USE_VNDK:=
	LOCAL_VENDOR_MODULE:=		LOCAL_VENDOR_MODULE:=

core/dynamic_binary.mk

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -67,6 +67,11 @@ ifneq ($(HOST_OS),linux)
	my_pack_module_relocations := false		my_pack_module_relocations := false
	endif		endif

			# Relocation packer does not work with LLD yet.
			ifeq ($(my_use_clang_lld),true)
			my_pack_module_relocations := false
			endif

	ifeq (true,$(my_pack_module_relocations))		ifeq (true,$(my_pack_module_relocations))
	# Pack relocations		# Pack relocations
	$(relocation_packer_output): $(relocation_packer_input)		$(relocation_packer_output): $(relocation_packer_input)

core/prebuilt_internal.mk

+8 −0

Original line number	Original line	Diff line number	Diff line
	@@ -6,6 +6,8 @@
	##		##
	###########################################################		###########################################################

			include $(BUILD_SYSTEM)/use_lld_setup.mk

	ifneq ($(LOCAL_PREBUILT_LIBS),)		ifneq ($(LOCAL_PREBUILT_LIBS),)
	$(error dont use LOCAL_PREBUILT_LIBS anymore LOCAL_PATH=$(LOCAL_PATH))		$(error dont use LOCAL_PREBUILT_LIBS anymore LOCAL_PATH=$(LOCAL_PATH))
	endif		endif
	@@ -70,6 +72,12 @@ ifeq (SHARED_LIBRARIES,$(LOCAL_MODULE_CLASS))
	ifeq ($(DISABLE_RELOCATION_PACKER),true)		ifeq ($(DISABLE_RELOCATION_PACKER),true)
	my_pack_module_relocations := false		my_pack_module_relocations := false
	endif		endif

			# Relocation packer does not work with LLD yet.
			# my_use_clang_lld might be used befor set up in binary.mk
			ifeq ($(my_use_clang_lld),true)
			my_pack_module_relocations := false
			endif
	endif		endif

	ifneq ($(filter STATIC_LIBRARIES SHARED_LIBRARIES,$(LOCAL_MODULE_CLASS)),)		ifneq ($(filter STATIC_LIBRARIES SHARED_LIBRARIES,$(LOCAL_MODULE_CLASS)),)

core/soong_config.mk

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -99,6 +99,7 @@ $(call add_json_list, CFIExcludePaths, $(CFI_EXCLUDE_PATHS) $(
	$(call add_json_list, CFIIncludePaths, $(CFI_INCLUDE_PATHS) $(PRODUCT_CFI_INCLUDE_PATHS))		$(call add_json_list, CFIIncludePaths, $(CFI_INCLUDE_PATHS) $(PRODUCT_CFI_INCLUDE_PATHS))
	$(call add_json_list, IntegerOverflowExcludePaths, $(INTEGER_OVERFLOW_EXCLUDE_PATHS) $(PRODUCT_INTEGER_OVERFLOW_EXCLUDE_PATHS))		$(call add_json_list, IntegerOverflowExcludePaths, $(INTEGER_OVERFLOW_EXCLUDE_PATHS) $(PRODUCT_INTEGER_OVERFLOW_EXCLUDE_PATHS))

			$(call add_json_bool, UseClangLld, $(filter 1 true,$(USE_CLANG_LLD)))
	$(call add_json_bool, ClangTidy, $(filter 1 true,$(WITH_TIDY)))		$(call add_json_bool, ClangTidy, $(filter 1 true,$(WITH_TIDY)))
	$(call add_json_str, TidyChecks, $(WITH_TIDY_CHECKS))		$(call add_json_str, TidyChecks, $(WITH_TIDY_CHECKS))

Original line number	Original line	Diff line number	Diff line
	@@ -7,6 +7,7 @@

	#######################################		#######################################
	include $(BUILD_SYSTEM)/base_rules.mk		include $(BUILD_SYSTEM)/base_rules.mk
			include $(BUILD_SYSTEM)/use_lld_setup.mk
	#######################################		#######################################

	##################################################		##################################################
	@@ -516,7 +517,11 @@ ifeq ($(my_clang),true)
	my_target_global_cflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)CLANG_$(my_prefix)GLOBAL_CFLAGS)		my_target_global_cflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)CLANG_$(my_prefix)GLOBAL_CFLAGS)
	my_target_global_conlyflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)CLANG_$(my_prefix)GLOBAL_CONLYFLAGS) $(my_c_std_conlyflags)		my_target_global_conlyflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)CLANG_$(my_prefix)GLOBAL_CONLYFLAGS) $(my_c_std_conlyflags)
	my_target_global_cppflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)CLANG_$(my_prefix)GLOBAL_CPPFLAGS) $(my_cpp_std_cppflags)		my_target_global_cppflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)CLANG_$(my_prefix)GLOBAL_CPPFLAGS) $(my_cpp_std_cppflags)
			ifeq ($(my_use_clang_lld),true)
			my_target_global_ldflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)CLANG_$(my_prefix)GLOBAL_LLDFLAGS)
			else
	my_target_global_ldflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)CLANG_$(my_prefix)GLOBAL_LDFLAGS)		my_target_global_ldflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)CLANG_$(my_prefix)GLOBAL_LDFLAGS)
			endif # my_use_clang_lld
	else		else
	my_target_global_cflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)GLOBAL_CFLAGS)		my_target_global_cflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)GLOBAL_CFLAGS)
	my_target_global_conlyflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)GLOBAL_CONLYFLAGS) $(my_c_std_conlyflags)		my_target_global_conlyflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)GLOBAL_CONLYFLAGS) $(my_c_std_conlyflags)