From cc737a5aa322909ae31c4a016d630c68571b80b2 Mon Sep 17 00:00:00 2001 From: Ying Wang Date: Fri, 8 Apr 2011 14:57:36 -0700 Subject: [PATCH] Add NDK crtbegin_so.o and crtend_so.o if they exist. Change-Id: Ic088a986d3810a1d313df30361145a467ba07e06 --- core/shared_library.mk | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/core/shared_library.mk b/core/shared_library.mk index 77d253f82..0393d17e9 100644 --- a/core/shared_library.mk +++ b/core/shared_library.mk @@ -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)