Merge "Add NDK crtbegin_so.o and crtend_so.o if they exist."
This commit is contained in:
commit
e442c1361a
|
@ -35,11 +35,8 @@ my_target_crtbegin_so_o := $(TARGET_CRTBEGIN_SO_O)
|
|||
my_target_crtend_so_o := $(TARGET_CRTEND_SO_O)
|
||||
ifdef LOCAL_NDK_VERSION
|
||||
my_target_global_ld_dirs += -L$(my_ndk_version_root)/usr/lib
|
||||
# The latest ndk does NOT support TARGET_CRTBEGIN_SO_O and TARGET_CRTEND_SO_O yet.
|
||||
# my_target_crtbegin_so_o := $(my_ndk_version_root)/usr/lib/crtbegin_so.o
|
||||
# my_target_crtend_so_o := $(my_ndk_version_root)/usr/lib/crtend_so.o
|
||||
my_target_crtbegin_so_o :=
|
||||
my_target_crtend_so_o :=
|
||||
my_target_crtbegin_so_o := $(wildcard $(my_ndk_version_root)/usr/lib/crtbegin_so.o)
|
||||
my_target_crtend_so_o := $(wildcard $(my_ndk_version_root)/usr/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)
|
||||
|
|
Loading…
Reference in New Issue