diff options
| author | Elliott Hughes <enh@google.com> | 2014-04-03 15:49:54 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2014-04-03 15:49:54 -0700 |
| commit | 1bc030b6c8a52e1911efcd58d6fbc7f982649167 (patch) | |
| tree | ce73112c2641ea3c28e34a886e1795d7ac3016a1 /NativeCode.mk | |
| parent | e471f800ea4b4a8549ac2d4979261a499fc0d81e (diff) | |
| download | libcore-1bc030b6c8a52e1911efcd58d6fbc7f982649167.zip libcore-1bc030b6c8a52e1911efcd58d6fbc7f982649167.tar.gz libcore-1bc030b6c8a52e1911efcd58d6fbc7f982649167.tar.bz2 | |
Finish moving away from LD_LIBRARY_PATH on Android.
We'll still use LD_LIBRARY_PATH if it's set, for testing or for the
host, but we now ask the dynamic linker what to do.
Bug: 12585421
Change-Id: I1457a63ead89fa8f8aeabc002c0b9038295b886e
Diffstat (limited to 'NativeCode.mk')
| -rw-r--r-- | NativeCode.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/NativeCode.mk b/NativeCode.mk index 4d19147..733f62e 100644 --- a/NativeCode.mk +++ b/NativeCode.mk @@ -82,7 +82,7 @@ LOCAL_CFLAGS += $(core_cflags) LOCAL_CPPFLAGS += $(core_cppflags) LOCAL_SRC_FILES += $(core_src_files) LOCAL_C_INCLUDES += $(core_c_includes) -LOCAL_SHARED_LIBRARIES += $(core_shared_libraries) libcrypto libexpat libicuuc libicui18n libnativehelper libz libutils +LOCAL_SHARED_LIBRARIES += $(core_shared_libraries) libcrypto libdl libexpat libicuuc libicui18n libnativehelper libz libutils LOCAL_STATIC_LIBRARIES += $(core_static_libraries) libziparchive LOCAL_MODULE_TAGS := optional LOCAL_MODULE := libjavacore |