am 0ea16fcc: am 60335c03: Merge "Revert "Revert "Fix the libgcc/libatomic link order.""" (8985a409) · Commits · e / os / android_build

core/definitions.mk

+6 −8

Original line number	Diff line number	Diff line
		@@ -1404,14 +1404,13 @@ $(hide) $(PRIVATE_CXX) \
		$(if $(PRIVATE_GROUP_STATIC_LIBRARIES),-Wl$(comma)--start-group) \
		$(call normalize-target-libraries,$(PRIVATE_ALL_STATIC_LIBRARIES)) \
		$(if $(PRIVATE_GROUP_STATIC_LIBRARIES),-Wl$(comma)--end-group) \
		$(if $(TARGET_BUILD_APPS),$(PRIVATE_TARGET_LIBGCC)) \
		$(if $(filter true,$(NATIVE_COVERAGE)),$(PRIVATE_TARGET_LIBGCOV)) \
		$(PRIVATE_TARGET_LIBATOMIC) \
		$(PRIVATE_TARGET_LIBGCC) \
		$(call normalize-target-libraries,$(PRIVATE_ALL_SHARED_LIBRARIES)) \
		-o $@ \
		$(PRIVATE_TARGET_GLOBAL_LDFLAGS) \
		$(PRIVATE_LDFLAGS) \
		$(PRIVATE_TARGET_LIBATOMIC) \
		$(if $(filter true,$(NATIVE_COVERAGE)),$(PRIVATE_TARGET_LIBGCOV)) \
		$(PRIVATE_TARGET_LIBGCC) \
		$(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTEND_SO_O)) \
		$(PRIVATE_LDLIBS)
		endef
		@@ -1468,14 +1467,13 @@ $(hide) $(PRIVATE_CXX) -pie \
		$(if $(PRIVATE_GROUP_STATIC_LIBRARIES),-Wl$(comma)--start-group) \
		$(call normalize-target-libraries,$(PRIVATE_ALL_STATIC_LIBRARIES)) \
		$(if $(PRIVATE_GROUP_STATIC_LIBRARIES),-Wl$(comma)--end-group) \
		$(if $(TARGET_BUILD_APPS),$(PRIVATE_TARGET_LIBGCC)) \
		$(if $(filter true,$(NATIVE_COVERAGE)),$(PRIVATE_TARGET_LIBGCOV)) \
		$(PRIVATE_TARGET_LIBATOMIC) \
		$(PRIVATE_TARGET_LIBGCC) \
		$(call normalize-target-libraries,$(PRIVATE_ALL_SHARED_LIBRARIES)) \
		-o $@ \
		$(PRIVATE_TARGET_GLOBAL_LDFLAGS) \
		$(PRIVATE_LDFLAGS) \
		$(PRIVATE_TARGET_LIBATOMIC) \
		$(if $(filter true,$(NATIVE_COVERAGE)),$(PRIVATE_TARGET_LIBGCOV)) \
		$(PRIVATE_TARGET_LIBGCC) \
		$(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTEND_O)) \
		$(PRIVATE_LDLIBS)
		endef