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

Commit e5836c4b authored by Dan Willemsen's avatar Dan Willemsen
Browse files

Remove GLOBAL_LD_DIRS 

The last user of this was the NDK, which has been using full paths in
binary.mk. So remove it.

Test: lunch aosp_arm-eng; m -j native
Change-Id: Ida2523a2d19131ee3ef005edb3e5bcf830710b11
parent 31543713

core/definitions.mk

+0 −3
Original line number Diff line number Diff line
@@ -1773,7 +1773,6 @@ $(hide) $(PRIVATE_CXX) \ 
	-nostdlib -Wl,-soname,$(notdir $@) \

	-Wl,--gc-sections \

	$(if $(filter true,$(PRIVATE_CLANG)),-shared,-Wl$(comma)-shared) \

	$(PRIVATE_TARGET_GLOBAL_LD_DIRS) \

	$(PRIVATE_TARGET_CRTBEGIN_SO_O) \

	$(PRIVATE_ALL_OBJECTS) \

	-Wl,--whole-archive \
@@ -1860,7 +1859,6 @@ $(hide) $(PRIVATE_CXX) -pie \ 
	-Wl,-dynamic-linker,$(PRIVATE_LINKER) \

	-Wl,--gc-sections \

	-Wl,-z,nocopyreloc \

	$(PRIVATE_TARGET_GLOBAL_LD_DIRS) \

	-Wl,-rpath-link=$(PRIVATE_TARGET_OUT_INTERMEDIATE_LIBRARIES) \

	$(PRIVATE_TARGET_CRTBEGIN_DYNAMIC_O) \

	$(PRIVATE_ALL_OBJECTS) \
@@ -1904,7 +1902,6 @@ $(hide) $(PRIVATE_CXX) \ 
	$(if $(filter $(PRIVATE_LDFLAGS),-shared),,-static) \

	-Wl,--gc-sections \

	-o $@ \

	$(PRIVATE_TARGET_GLOBAL_LD_DIRS) \

	$(PRIVATE_TARGET_CRTBEGIN_STATIC_O) \

	$(PRIVATE_TARGET_GLOBAL_LDFLAGS) \

	$(PRIVATE_LDFLAGS) \

core/executable_internal.mk

+0 −10
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ endif 
endif



# Define PRIVATE_ variables from global vars

my_target_global_ld_dirs :=

ifeq ($(LOCAL_NO_LIBGCC),true)

my_target_libgcc :=

else
@@ -51,19 +50,10 @@ my_target_crtbegin_static_o := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_OUT_INTERMED 
my_target_crtend_o := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtend_android.o

endif

ifdef LOCAL_SDK_VERSION

# 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.

my_target_global_ld_dirs := \

    $(addprefix -L, $(patsubst %/,%,$(dir $(my_ndk_stl_shared_lib_fullpath))) \

    $(my_ndk_sysroot_lib)) \

    $(my_target_global_ld_dirs)

my_target_global_ldflags := $(my_ndk_stl_shared_lib) $(my_target_global_ldflags)

my_target_crtbegin_dynamic_o := $(wildcard $(my_ndk_sysroot_lib)/crtbegin_dynamic.o)

my_target_crtbegin_static_o := $(wildcard $(my_ndk_sysroot_lib)/crtbegin_static.o)

my_target_crtend_o := $(wildcard $(my_ndk_sysroot_lib)/crtend_android.o)

endif

$(linked_module): PRIVATE_TARGET_GLOBAL_LD_DIRS := $(my_target_global_ld_dirs)

$(linked_module): PRIVATE_TARGET_GLOBAL_LDFLAGS := $(my_target_global_ldflags)

$(linked_module): PRIVATE_TARGET_LIBGCC := $(my_target_libgcc)

$(linked_module): PRIVATE_TARGET_LIBATOMIC := $(my_target_libatomic)

$(linked_module): PRIVATE_TARGET_CRTBEGIN_DYNAMIC_O := $(my_target_crtbegin_dynamic_o)

core/shared_library_internal.mk

+0 −10
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ OVERRIDE_BUILT_MODULE_PATH := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_OUT_INTERMEDI 
include $(BUILD_SYSTEM)/dynamic_binary.mk



# Define PRIVATE_ variables from global vars

my_target_global_ld_dirs :=

ifeq ($(LOCAL_NO_LIBGCC),true)

my_target_libgcc :=

else
@@ -54,18 +53,9 @@ my_target_crtbegin_so_o := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_OUT_INTERMEDIATE 
my_target_crtend_so_o := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtend_so.o

endif

ifdef LOCAL_SDK_VERSION

# 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.

my_target_global_ld_dirs := \

    $(addprefix -L, $(patsubst %/,%,$(dir $(my_ndk_stl_shared_lib_fullpath))) \

    $(my_ndk_sysroot_lib)) \

    $(my_target_global_ld_dirs)

my_target_global_ldflags := $(my_ndk_stl_shared_lib) $(my_target_global_ldflags)

my_target_crtbegin_so_o := $(wildcard $(my_ndk_sysroot_lib)/crtbegin_so.o)

my_target_crtend_so_o := $(wildcard $(my_ndk_sysroot_lib)/crtend_so.o)

endif

$(linked_module): PRIVATE_TARGET_GLOBAL_LD_DIRS := $(my_target_global_ld_dirs)

$(linked_module): PRIVATE_TARGET_GLOBAL_LDFLAGS := $(my_target_global_ldflags)

$(linked_module): PRIVATE_TARGET_LIBGCC := $(my_target_libgcc)

$(linked_module): PRIVATE_TARGET_LIBATOMIC := $(my_target_libatomic)

$(linked_module): PRIVATE_TARGET_CRTBEGIN_SO_O := $(my_target_crtbegin_so_o)