Merge "Remove LOCAL_USE_CLANG_LLD" into main (5a11f7f4) · Commits · e / os / android_build

core/binary.mk

+7 −16

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

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

		##################################################
		@@ -1629,7 +1628,6 @@ ifndef LOCAL_IS_HOST_MODULE
		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_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)
		include $(BUILD_SYSTEM)/pack_dyn_relocs_setup.mk
		ifeq ($(my_pack_module_relocations),true)
		@@ -1637,9 +1635,6 @@ ifeq ($(my_use_clang_lld),true)
		else
		my_target_global_ldflags += -Wl,--pack-dyn-relocs=none
		endif
		else
		my_target_global_ldflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)CLANG_$(my_prefix)GLOBAL_LDFLAGS)
		endif # my_use_clang_lld

		ifeq ($(call module-in-vendor-or-product),true)
		my_target_global_c_includes :=
		@@ -1684,11 +1679,7 @@ my_host_global_c_system_includes := $(SRC_SYSTEM_HEADERS) \
		my_host_global_cflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)CLANG_$(my_prefix)GLOBAL_CFLAGS)
		my_host_global_conlyflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)CLANG_$(my_prefix)GLOBAL_CONLYFLAGS) $(my_c_std_conlyflags)
		my_host_global_cppflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)CLANG_$(my_prefix)GLOBAL_CPPFLAGS) $(my_cpp_std_cppflags)
		ifeq ($(my_use_clang_lld),true)
		my_host_global_ldflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)CLANG_$(my_prefix)GLOBAL_LLDFLAGS)
		else
		my_host_global_ldflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)CLANG_$(my_prefix)GLOBAL_LDFLAGS)
		endif # my_use_clang_lld

		$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_GLOBAL_C_INCLUDES := $(my_host_global_c_includes)
		$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_GLOBAL_C_SYSTEM_INCLUDES := $(my_host_global_c_system_includes)

core/clear_vars.mk

+0 −1

Original line number	Diff line number	Diff line
		@@ -308,7 +308,6 @@ LOCAL_UNCOMPRESS_DEX:=
		LOCAL_UNINSTALLABLE_MODULE:=
		LOCAL_UNSTRIPPED_PATH:=
		LOCAL_USE_AAPT2:=
		LOCAL_USE_CLANG_LLD:=
		LOCAL_USE_VNDK:=
		LOCAL_IN_VENDOR:=
		LOCAL_IN_PRODUCT:=

core/dynamic_binary.mk

+0 −1

Original line number	Diff line number	Diff line
		@@ -30,7 +30,6 @@ linked_module := $(intermediates)/LINKED/$(notdir $(my_installed_module_stem))
		LOCAL_INTERMEDIATE_TARGETS := $(linked_module)

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

core/prebuilt_internal.mk

+1 −3

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

		include $(BUILD_SYSTEM)/use_lld_setup.mk

		ifneq ($(LOCAL_PREBUILT_LIBS),)
		$(call pretty-error,dont use LOCAL_PREBUILT_LIBS anymore)
		endif

core/use_lld_setup.mk

deleted100644 → 0

+0 −20

Original line number	Diff line number	Diff line
		#############################################################
		## Set up flags based on LOCAL_USE_CLANG_LLD.
		## Input variables: LOCAL_USE_CLANG_LLD
		## Output variables: my_use_clang_lld
		#############################################################

		# Use LLD by default.
		# Do not use LLD if LOCAL_USE_CLANG_LLD is false or 0
		my_use_clang_lld := true
		ifneq (,$(LOCAL_USE_CLANG_LLD))
		ifneq (,$(filter 0 false,$(LOCAL_USE_CLANG_LLD)))
		my_use_clang_lld := false
		endif
		endif

		# Do not use LLD for Darwin host executables or shared libraries. See
		# https://lld.llvm.org/AtomLLD.html for status of lld for Mach-O.
		ifeq ($($(my_prefix)OS),darwin)
		my_use_clang_lld := false
		endif