diff options
| author | Ying Wang <wangying@google.com> | 2011-03-04 11:21:38 -0800 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2011-03-04 11:21:38 -0800 |
| commit | 7ee6c4033b2d2c0967e52425ff70f7e66bcc744d (patch) | |
| tree | 80ed317effa9a626dfa1c5bfef62634aeb2a65ad /core/shared_library.mk | |
| parent | 3e1d3c43944e036118e8e86e315505fbce899ee8 (diff) | |
| download | build-7ee6c4033b2d2c0967e52425ff70f7e66bcc744d.zip build-7ee6c4033b2d2c0967e52425ff70f7e66bcc744d.tar.gz build-7ee6c4033b2d2c0967e52425ff70f7e66bcc744d.tar.bz2 | |
Add NDK crtbegin_so.o and crtend_so.o if they exist.
Change-Id: I3d49d5a2d0e1b6bf26a0e1df0df2d6d7e026f85a
Diffstat (limited to 'core/shared_library.mk')
| -rw-r--r-- | core/shared_library.mk | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/core/shared_library.mk b/core/shared_library.mk index 00673fc..940fe61 100644 --- a/core/shared_library.mk +++ b/core/shared_library.mk @@ -37,11 +37,8 @@ ifdef LOCAL_NDK_VERSION my_target_global_ld_dirs += $(addprefix -L, $(patsubst %/,%,$(dir $(my_ndk_stl_shared_lib_fullpath))) \ $(my_ndk_version_root)/usr/lib) my_target_global_ldflags := $(my_ndk_stl_shared_lib) $(my_target_global_ldflags) -# 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) |