Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cc733968 authored Apr 02, 2014 by Dmitriy Ivanov Committed by Android Git Automerger Apr 02, 2014

am 7e739e54: am 83695037: am e44e8b0f: Merge "Remove redundant my_target_global_ldflags"

* commit '7e739e54':
  Remove redundant my_target_global_ldflags

parents a6e629e8 7e739e54

core/executable_internal.mk

+0 −5

Original line number	Diff line number	Diff line
		@@ -28,11 +28,6 @@ include $(BUILD_SYSTEM)/dynamic_binary.mk

		# Define PRIVATE_ variables from global vars
		my_target_global_ld_dirs := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_GLOBAL_LD_DIRS)
		ifeq ($(LOCAL_CLANG),true)
		my_target_global_ldflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)CLANG_TARGET_GLOBAL_LDFLAGS)
		else
		my_target_global_ldflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_GLOBAL_LDFLAGS)
		endif
		my_target_fdo_lib := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_FDO_LIB)
		my_target_libgcc := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_LIBGCC)
		my_target_crtbegin_dynamic_o := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_CRTBEGIN_DYNAMIC_O)

core/shared_library_internal.mk

+0 −5

Original line number	Diff line number	Diff line
		@@ -40,11 +40,6 @@ include $(BUILD_SYSTEM)/dynamic_binary.mk

		# Define PRIVATE_ variables from global vars
		my_target_global_ld_dirs := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_GLOBAL_LD_DIRS)
		ifeq ($(LOCAL_CLANG),true)
		my_target_global_ldflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)CLANG_TARGET_GLOBAL_LDFLAGS)
		else
		my_target_global_ldflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_GLOBAL_LDFLAGS)
		endif
		my_target_fdo_lib := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_FDO_LIB)
		my_target_libgcc := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_LIBGCC)
		my_target_crtbegin_so_o := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_CRTBEGIN_SO_O)