diff options
| author | Ying Wang <wangying@google.com> | 2011-03-03 18:53:53 -0800 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2011-03-04 10:48:28 -0800 |
| commit | cce4c973e42a5a2f4256eb2792858b27ea15f375 (patch) | |
| tree | 3e2dc70cf7f789763d205ce7acfa99dad865ba71 /core/shared_library.mk | |
| parent | a67ce69e9a1ff267cb3c01bdd3214b6c68aa6f63 (diff) | |
| download | build-cce4c973e42a5a2f4256eb2792858b27ea15f375.zip build-cce4c973e42a5a2f4256eb2792858b27ea15f375.tar.gz build-cce4c973e42a5a2f4256eb2792858b27ea15f375.tar.bz2 | |
Support stl variants when LOCAL_NDK_VERSION is set.
LOCAL_NDK_STL_VARIANT can be set to system, stlport_static, stlport_shared
or gnustl_static. It defaults to system.
Change-Id: I2840d30ff732a00bc0ea70eab8a8179aea0abbdf
Diffstat (limited to 'core/shared_library.mk')
| -rw-r--r-- | core/shared_library.mk | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/shared_library.mk b/core/shared_library.mk index 77d253f..00673fc 100644 --- a/core/shared_library.mk +++ b/core/shared_library.mk @@ -34,7 +34,9 @@ my_target_libgcc := $(TARGET_LIBGCC) 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 +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 |