Unhardcode linker soname

Set and use DT_SONAME instead. Test: bionic-unit-tests Change-Id: I38a246c8a43664792424e8fef96ae2ff5f743ba6
spsforks · Jan 4, 2018 · 0532119 · 0532119
1 parent 558a4f5
commit 0532119
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/linker/Android.bp b/linker/Android.bp
@@ -130,6 +130,7 @@ cc_binary {
         "-shared",
         "-Wl,-Bsymbolic",
         "-Wl,--exclude-libs,ALL",
+        "-Wl,-soname,ld-android.so",
     ],
 
     cflags: [

diff --git a/linker/dlfcn.cpp b/linker/dlfcn.cpp
@@ -298,7 +298,7 @@ soinfo* get_libdl_info(const char* linker_path,
     __libdl_info->ref_count_ = 1;
     __libdl_info->strtab_size_ = linker_si.strtab_size_;
     __libdl_info->local_group_root_ = __libdl_info;
-    __libdl_info->soname_ = "ld-android.so";
+    __libdl_info->soname_ = linker_si.soname_;
     __libdl_info->target_sdk_version_ = __ANDROID_API__;
     __libdl_info->generate_handle();
     __libdl_info->link_map_head.l_addr = linker_map.l_addr;