Merge "Simplify LOCAL_NO_CRT." (2e26f896) · Commits · e / os / android_build

core/binary.mk

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1067,7 +1067,6 @@ $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_C_INCLUDES := $(my_c_includes)
	$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_IMPORT_INCLUDES := $(import_includes)		$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_IMPORT_INCLUDES := $(import_includes)
	$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_LDFLAGS := $(my_ldflags)		$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_LDFLAGS := $(my_ldflags)
	$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_LDLIBS := $(my_ldlibs)		$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_LDLIBS := $(my_ldlibs)
	$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_NO_CRT := $(strip $(LOCAL_NO_CRT) $(LOCAL_NO_CRT_$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)))

	# this is really the way to get the files onto the command line instead		# this is really the way to get the files onto the command line instead
	# of using $^, because then LOCAL_ADDITIONAL_DEPENDENCIES doesn't work		# of using $^, because then LOCAL_ADDITIONAL_DEPENDENCIES doesn't work

core/clear_vars.mk

+0 −4

core/definitions.mk

+6 −7

Original line number	Original line	Diff line number	Diff line
	@@ -831,7 +831,6 @@ define dump-module-variables
	@echo PRIVATE_ALL_STATIC_LIBRARIES=$(PRIVATE_ALL_STATIC_LIBRARIES);		@echo PRIVATE_ALL_STATIC_LIBRARIES=$(PRIVATE_ALL_STATIC_LIBRARIES);
	@echo PRIVATE_ALL_WHOLE_STATIC_LIBRARIES=$(PRIVATE_ALL_WHOLE_STATIC_LIBRARIES);		@echo PRIVATE_ALL_WHOLE_STATIC_LIBRARIES=$(PRIVATE_ALL_WHOLE_STATIC_LIBRARIES);
	@echo PRIVATE_ALL_OBJECTS=$(PRIVATE_ALL_OBJECTS);		@echo PRIVATE_ALL_OBJECTS=$(PRIVATE_ALL_OBJECTS);
	@echo PRIVATE_NO_CRT=$(PRIVATE_NO_CRT);
	endef		endef

	###########################################################		###########################################################
	@@ -1443,7 +1442,7 @@ $(hide) $(PRIVATE_CXX) \
	-Wl,--gc-sections \		-Wl,--gc-sections \
	$(if $(filter true,$(PRIVATE_CLANG)),-shared,-Wl$(comma)-shared) \		$(if $(filter true,$(PRIVATE_CLANG)),-shared,-Wl$(comma)-shared) \
	$(PRIVATE_TARGET_GLOBAL_LD_DIRS) \		$(PRIVATE_TARGET_GLOBAL_LD_DIRS) \
	$(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTBEGIN_SO_O)) \		$(PRIVATE_TARGET_CRTBEGIN_SO_O) \
	$(PRIVATE_ALL_OBJECTS) \		$(PRIVATE_ALL_OBJECTS) \
	-Wl,--whole-archive \		-Wl,--whole-archive \
	$(call normalize-target-libraries,$(PRIVATE_ALL_WHOLE_STATIC_LIBRARIES)) \		$(call normalize-target-libraries,$(PRIVATE_ALL_WHOLE_STATIC_LIBRARIES)) \
	@@ -1459,7 +1458,7 @@ $(hide) $(PRIVATE_CXX) \
	-o $@ \		-o $@ \
	$(PRIVATE_TARGET_GLOBAL_LDFLAGS) \		$(PRIVATE_TARGET_GLOBAL_LDFLAGS) \
	$(PRIVATE_LDFLAGS) \		$(PRIVATE_LDFLAGS) \
	$(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTEND_SO_O)) \		$(PRIVATE_TARGET_CRTEND_SO_O) \
	$(PRIVATE_LDLIBS)		$(PRIVATE_LDLIBS)
	endef		endef

	@@ -1516,7 +1515,7 @@ $(hide) $(PRIVATE_CXX) -pie \
	-Wl,-z,nocopyreloc \		-Wl,-z,nocopyreloc \
	$(PRIVATE_TARGET_GLOBAL_LD_DIRS) \		$(PRIVATE_TARGET_GLOBAL_LD_DIRS) \
	-Wl,-rpath-link=$(PRIVATE_TARGET_OUT_INTERMEDIATE_LIBRARIES) \		-Wl,-rpath-link=$(PRIVATE_TARGET_OUT_INTERMEDIATE_LIBRARIES) \
	$(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTBEGIN_DYNAMIC_O)) \		$(PRIVATE_TARGET_CRTBEGIN_DYNAMIC_O) \
	$(PRIVATE_ALL_OBJECTS) \		$(PRIVATE_ALL_OBJECTS) \
	-Wl,--whole-archive \		-Wl,--whole-archive \
	$(call normalize-target-libraries,$(PRIVATE_ALL_WHOLE_STATIC_LIBRARIES)) \		$(call normalize-target-libraries,$(PRIVATE_ALL_WHOLE_STATIC_LIBRARIES)) \
	@@ -1532,7 +1531,7 @@ $(hide) $(PRIVATE_CXX) -pie \
	-o $@ \		-o $@ \
	$(PRIVATE_TARGET_GLOBAL_LDFLAGS) \		$(PRIVATE_TARGET_GLOBAL_LDFLAGS) \
	$(PRIVATE_LDFLAGS) \		$(PRIVATE_LDFLAGS) \
	$(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTEND_O)) \		$(PRIVATE_TARGET_CRTEND_O) \
	$(PRIVATE_LDLIBS)		$(PRIVATE_LDLIBS)
	endef		endef

	@@ -1560,7 +1559,7 @@ $(hide) $(PRIVATE_CXX) \
	-Wl,--gc-sections \		-Wl,--gc-sections \
	-o $@ \		-o $@ \
	$(PRIVATE_TARGET_GLOBAL_LD_DIRS) \		$(PRIVATE_TARGET_GLOBAL_LD_DIRS) \
	$(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTBEGIN_STATIC_O)) \		$(PRIVATE_TARGET_CRTBEGIN_STATIC_O) \
	$(PRIVATE_TARGET_GLOBAL_LDFLAGS) \		$(PRIVATE_TARGET_GLOBAL_LDFLAGS) \
	$(PRIVATE_LDFLAGS) \		$(PRIVATE_LDFLAGS) \
	$(PRIVATE_ALL_OBJECTS) \		$(PRIVATE_ALL_OBJECTS) \
	@@ -1577,7 +1576,7 @@ $(hide) $(PRIVATE_CXX) \
	$(call normalize-target-libraries,$(filter %libcompiler_rt.a,$(PRIVATE_ALL_STATIC_LIBRARIES))) \		$(call normalize-target-libraries,$(filter %libcompiler_rt.a,$(PRIVATE_ALL_STATIC_LIBRARIES))) \
	$(PRIVATE_TARGET_LIBGCC) \		$(PRIVATE_TARGET_LIBGCC) \
	-Wl,--end-group \		-Wl,--end-group \
	$(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTEND_O))		$(PRIVATE_TARGET_CRTEND_O)
	endef		endef

	define transform-o-to-static-executable		define transform-o-to-static-executable

core/executable_internal.mk

+6 −0

Original line number	Original line	Diff line number	Diff line
	@@ -43,9 +43,15 @@ else
	my_target_libgcc := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_LIBGCC)		my_target_libgcc := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_LIBGCC)
	endif		endif
	my_target_libatomic := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_LIBATOMIC)		my_target_libatomic := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_LIBATOMIC)
			ifeq ($(LOCAL_NO_CRT),true)
			my_target_crtbegin_dynamic_o :=
			my_target_crtbegin_static_o :=
			my_target_crtend_o :=
			else
	my_target_crtbegin_dynamic_o := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_CRTBEGIN_DYNAMIC_O)		my_target_crtbegin_dynamic_o := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_CRTBEGIN_DYNAMIC_O)
	my_target_crtbegin_static_o := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_CRTBEGIN_STATIC_O)		my_target_crtbegin_static_o := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_CRTBEGIN_STATIC_O)
	my_target_crtend_o := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_CRTEND_O)		my_target_crtend_o := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_CRTEND_O)
			endif
	ifdef LOCAL_SDK_VERSION		ifdef LOCAL_SDK_VERSION
	# Make sure the prebuilt NDK paths are put ahead of the TARGET_GLOBAL_LD_DIRS,		# Make sure the prebuilt NDK paths are put ahead of the TARGET_GLOBAL_LD_DIRS,
	# so we don't have race condition when the system libraries (such as libc, libstdc++) are also built in the tree.		# so we don't have race condition when the system libraries (such as libc, libstdc++) are also built in the tree.

core/shared_library_internal.mk

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -48,8 +48,13 @@ else
	my_target_libgcc := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_LIBGCC)		my_target_libgcc := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_LIBGCC)
	endif		endif
	my_target_libatomic := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_LIBATOMIC)		my_target_libatomic := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_LIBATOMIC)
			ifeq ($(LOCAL_NO_CRT),true)
			my_target_crtbegin_so_o :=
			my_target_crtend_so_o :=
			else
	my_target_crtbegin_so_o := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_CRTBEGIN_SO_O)		my_target_crtbegin_so_o := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_CRTBEGIN_SO_O)
	my_target_crtend_so_o := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_CRTEND_SO_O)		my_target_crtend_so_o := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_CRTEND_SO_O)
			endif
	ifdef LOCAL_SDK_VERSION		ifdef LOCAL_SDK_VERSION
	# Make sure the prebuilt NDK paths are put ahead of the TARGET_GLOBAL_LD_DIRS,		# Make sure the prebuilt NDK paths are put ahead of the TARGET_GLOBAL_LD_DIRS,
	# so we don't have race condition when the system libraries (such as libc, libstdc++) are also built in the tree.		# so we don't have race condition when the system libraries (such as libc, libstdc++) are also built in the tree.

Original line number	Original line	Diff line number	Diff line
	@@ -192,7 +192,6 @@ LOCAL_CLANG_CPPFLAGS_$(TARGET_ARCH):=
	LOCAL_C_INCLUDES_$(TARGET_ARCH):=		LOCAL_C_INCLUDES_$(TARGET_ARCH):=
	LOCAL_ASFLAGS_$(TARGET_ARCH):=		LOCAL_ASFLAGS_$(TARGET_ARCH):=
	LOCAL_CLANG_ASFLAGS_$(TARGET_ARCH):=		LOCAL_CLANG_ASFLAGS_$(TARGET_ARCH):=
	LOCAL_NO_CRT_$(TARGET_ARCH):=
	LOCAL_LDFLAGS_$(TARGET_ARCH):=		LOCAL_LDFLAGS_$(TARGET_ARCH):=
	LOCAL_CLANG_LDFLAGS_$(TARGET_ARCH):=		LOCAL_CLANG_LDFLAGS_$(TARGET_ARCH):=
	LOCAL_SHARED_LIBRARIES_$(TARGET_ARCH):=		LOCAL_SHARED_LIBRARIES_$(TARGET_ARCH):=
	@@ -211,7 +210,6 @@ LOCAL_CLANG_CPPFLAGS_$(TARGET_2ND_ARCH):=
	LOCAL_C_INCLUDES_$(TARGET_2ND_ARCH):=		LOCAL_C_INCLUDES_$(TARGET_2ND_ARCH):=
	LOCAL_ASFLAGS_$(TARGET_2ND_ARCH):=		LOCAL_ASFLAGS_$(TARGET_2ND_ARCH):=
	LOCAL_CLANG_ASFLAGS_$(TARGET_2ND_ARCH):=		LOCAL_CLANG_ASFLAGS_$(TARGET_2ND_ARCH):=
	LOCAL_NO_CRT_$(TARGET_2ND_ARCH):=
	LOCAL_LDFLAGS_$(TARGET_2ND_ARCH):=		LOCAL_LDFLAGS_$(TARGET_2ND_ARCH):=
	LOCAL_CLANG_LDFLAGS_$(TARGET_2ND_ARCH):=		LOCAL_CLANG_LDFLAGS_$(TARGET_2ND_ARCH):=
	LOCAL_SHARED_LIBRARIES_$(TARGET_2ND_ARCH):=		LOCAL_SHARED_LIBRARIES_$(TARGET_2ND_ARCH):=
	@@ -230,7 +228,6 @@ LOCAL_CLANG_CPPFLAGS_$(HOST_ARCH):=
	LOCAL_C_INCLUDES_$(HOST_ARCH):=		LOCAL_C_INCLUDES_$(HOST_ARCH):=
	LOCAL_ASFLAGS_$(HOST_ARCH):=		LOCAL_ASFLAGS_$(HOST_ARCH):=
	LOCAL_CLANG_ASFLAGS_$(HOST_ARCH):=		LOCAL_CLANG_ASFLAGS_$(HOST_ARCH):=
	LOCAL_NO_CRT_$(HOST_ARCH):=
	LOCAL_LDFLAGS_$(HOST_ARCH):=		LOCAL_LDFLAGS_$(HOST_ARCH):=
	LOCAL_CLANG_LDFLAGS_$(HOST_ARCH):=		LOCAL_CLANG_LDFLAGS_$(HOST_ARCH):=
	LOCAL_SHARED_LIBRARIES_$(HOST_ARCH):=		LOCAL_SHARED_LIBRARIES_$(HOST_ARCH):=
	@@ -248,7 +245,6 @@ LOCAL_CLANG_CPPFLAGS_$(HOST_2ND_ARCH):=
	LOCAL_C_INCLUDES_$(HOST_2ND_ARCH):=		LOCAL_C_INCLUDES_$(HOST_2ND_ARCH):=
	LOCAL_ASFLAGS_$(HOST_2ND_ARCH):=		LOCAL_ASFLAGS_$(HOST_2ND_ARCH):=
	LOCAL_CLANG_ASFLAGS_$(HOST_2ND_ARCH):=		LOCAL_CLANG_ASFLAGS_$(HOST_2ND_ARCH):=
	LOCAL_NO_CRT_$(HOST_2ND_ARCH):=
	LOCAL_LDFLAGS_$(HOST_2ND_ARCH):=		LOCAL_LDFLAGS_$(HOST_2ND_ARCH):=
	LOCAL_CLANG_LDFLAGS_$(HOST_2ND_ARCH):=		LOCAL_CLANG_LDFLAGS_$(HOST_2ND_ARCH):=
	LOCAL_SHARED_LIBRARIES_$(HOST_2ND_ARCH):=		LOCAL_SHARED_LIBRARIES_$(HOST_2ND_ARCH):=