Merge "Stop linking against libatomic" (5727dc3d) · Commits · e / os / android_build

core/definitions.mk

+0 −3

Original line number	Diff line number	Diff line
		@@ -1752,7 +1752,6 @@ $(hide) $(PRIVATE_CXX_LINK) \
		$(if $(PRIVATE_GROUP_STATIC_LIBRARIES),-Wl$(comma)--end-group) \
		$(if $(filter true,$(NATIVE_COVERAGE)),$(PRIVATE_TARGET_COVERAGE_LIB)) \
		$(PRIVATE_TARGET_LIBCRT_BUILTINS) \
		$(PRIVATE_TARGET_LIBATOMIC) \
		$(PRIVATE_TARGET_GLOBAL_LDFLAGS) \
		$(PRIVATE_LDFLAGS) \
		$(PRIVATE_ALL_SHARED_LIBRARIES) \
		@@ -1787,7 +1786,6 @@ $(hide) $(PRIVATE_CXX_LINK) -pie \
		$(if $(PRIVATE_GROUP_STATIC_LIBRARIES),-Wl$(comma)--end-group) \
		$(if $(filter true,$(NATIVE_COVERAGE)),$(PRIVATE_TARGET_COVERAGE_LIB)) \
		$(PRIVATE_TARGET_LIBCRT_BUILTINS) \
		$(PRIVATE_TARGET_LIBATOMIC) \
		$(PRIVATE_TARGET_GLOBAL_LDFLAGS) \
		$(PRIVATE_LDFLAGS) \
		$(PRIVATE_ALL_SHARED_LIBRARIES) \
		@@ -1831,7 +1829,6 @@ $(hide) $(PRIVATE_CXX_LINK) \
		$(filter %libc.a %libc.hwasan.a,$(PRIVATE_ALL_STATIC_LIBRARIES)) \
		$(filter %libc_nomalloc.a %libc_nomalloc.hwasan.a,$(PRIVATE_ALL_STATIC_LIBRARIES)) \
		$(if $(filter true,$(NATIVE_COVERAGE)),$(PRIVATE_TARGET_COVERAGE_LIB)) \
		$(PRIVATE_TARGET_LIBATOMIC) \
		$(filter %libcompiler_rt.a %libcompiler_rt.hwasan.a,$(PRIVATE_ALL_STATIC_LIBRARIES)) \
		$(PRIVATE_TARGET_LIBCRT_BUILTINS) \
		-Wl,--end-group \

core/executable_internal.mk

+2 −4

Original line number	Diff line number	Diff line
		@@ -41,7 +41,6 @@ my_target_libcrt_builtins :=
		else
		my_target_libcrt_builtins := $($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)LIBCRT_BUILTINS)
		endif
		my_target_libatomic := $(call intermediates-dir-for,STATIC_LIBRARIES,libatomic,,,$(LOCAL_2ND_ARCH_VAR_PREFIX))/libatomic.a
		ifeq ($(LOCAL_NO_CRT),true)
		my_target_crtbegin_dynamic_o :=
		my_target_crtbegin_static_o :=
		@@ -61,18 +60,17 @@ my_target_crtbegin_static_o := $(SOONG_$(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_OBJECT
		my_target_crtend_o := $(SOONG_$(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_OBJECT_crtend_android.sdk.$(my_ndk_crt_version))
		endif
		$(linked_module): PRIVATE_TARGET_LIBCRT_BUILTINS := $(my_target_libcrt_builtins)
		$(linked_module): PRIVATE_TARGET_LIBATOMIC := $(my_target_libatomic)
		$(linked_module): PRIVATE_TARGET_CRTBEGIN_DYNAMIC_O := $(my_target_crtbegin_dynamic_o)
		$(linked_module): PRIVATE_TARGET_CRTBEGIN_STATIC_O := $(my_target_crtbegin_static_o)
		$(linked_module): PRIVATE_TARGET_CRTEND_O := $(my_target_crtend_o)
		$(linked_module): PRIVATE_POST_LINK_CMD := $(LOCAL_POST_LINK_CMD)

		ifeq ($(LOCAL_FORCE_STATIC_EXECUTABLE),true)
		$(linked_module): $(my_target_crtbegin_static_o) $(all_objects) $(all_libraries) $(my_target_crtend_o) $(my_target_libcrt_builtins) $(my_target_libatomic) $(CLANG_CXX)
		$(linked_module): $(my_target_crtbegin_static_o) $(all_objects) $(all_libraries) $(my_target_crtend_o) $(my_target_libcrt_builtins) $(CLANG_CXX)
		$(transform-o-to-static-executable)
		$(PRIVATE_POST_LINK_CMD)
		else
		$(linked_module): $(my_target_crtbegin_dynamic_o) $(all_objects) $(all_libraries) $(my_target_crtend_o) $(my_target_libcrt_builtins) $(my_target_libatomic) $(CLANG_CXX)
		$(linked_module): $(my_target_crtbegin_dynamic_o) $(all_objects) $(all_libraries) $(my_target_crtend_o) $(my_target_libcrt_builtins) $(CLANG_CXX)
		$(transform-o-to-executable)
		$(PRIVATE_POST_LINK_CMD)
		endif

core/shared_library_internal.mk

+0 −3

Original line number	Diff line number	Diff line
		@@ -39,7 +39,6 @@ my_target_libcrt_builtins :=
		else
		my_target_libcrt_builtins := $($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)LIBCRT_BUILTINS)
		endif
		my_target_libatomic := $(call intermediates-dir-for,STATIC_LIBRARIES,libatomic,,,$(LOCAL_2ND_ARCH_VAR_PREFIX))/libatomic.a
		ifeq ($(LOCAL_NO_CRT),true)
		my_target_crtbegin_so_o :=
		my_target_crtend_so_o :=
		@@ -55,7 +54,6 @@ my_target_crtbegin_so_o := $(SOONG_$(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_OBJECT_crt
		my_target_crtend_so_o := $(SOONG_$(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_OBJECT_crtend_so.sdk.$(my_ndk_crt_version))
		endif
		$(linked_module): PRIVATE_TARGET_LIBCRT_BUILTINS := $(my_target_libcrt_builtins)
		$(linked_module): PRIVATE_TARGET_LIBATOMIC := $(my_target_libatomic)
		$(linked_module): PRIVATE_TARGET_CRTBEGIN_SO_O := $(my_target_crtbegin_so_o)
		$(linked_module): PRIVATE_TARGET_CRTEND_SO_O := $(my_target_crtend_so_o)

		@@ -65,7 +63,6 @@ $(linked_module): \
		$(my_target_crtbegin_so_o) \
		$(my_target_crtend_so_o) \
		$(my_target_libcrt_builtins) \
		$(my_target_libatomic) \
		$(LOCAL_ADDITIONAL_DEPENDENCIES) $(CLANG_CXX)
		$(transform-o-to-shared-lib)