commit b2c1022f82b722ae6ce7dcf97d0c2c1acbdae7f0
author Jiyong Park <jiyong@google.com> Thu Jan 24 03:51:11 2019 -0800
committer android-build-merger <android-build-merger@google.com> Thu Jan 24 03:51:11 2019 -0800
tree c47a510f119df45fef6c7ff0abeeea61c216a592
parent 011d62483d0a81d59222a8a65d44a3ba0f2e0222
parent b621d1474d124765edd63b767d4e991d16414364

Merge "support LIB in runpath" am: a9aeccbf74
am: b621d1474d

Change-Id: Iac47ccf08a2acd1f97472d0d57534053776bdb2b

linker/Android.bp

diff --git a/linker/Android.bp b/linker/Android.bp
index e103ade..4991935 100644
--- a/linker/Android.bp
+++ b/linker/Android.bp
@@ -285,7 +285,11 @@
     symlinks: ["linker_asan"],
     recovery_available: true,
     multilib: {
+        lib32: {
+            cflags: ["-DLIB_PATH=\"lib\""],
+        },
         lib64: {
+            cflags: ["-DLIB_PATH=\"lib64\""],
             suffix: "64",
         },
     },

linker/linker_soinfo.cpp

diff --git a/linker/linker_soinfo.cpp b/linker/linker_soinfo.cpp
index dcc6bf3..89119aa 100644
--- a/linker/linker_soinfo.cpp
+++ b/linker/linker_soinfo.cpp
@@ -82,8 +82,15 @@
   split_path(path, ":", &runpaths);
 
   std::string origin = dirname(get_realpath());
-  // FIXME: add $LIB and $PLATFORM.
-  std::vector<std::pair<std::string, std::string>> params = {{"ORIGIN", origin}};
+  // FIXME: add $PLATFORM.
+  std::vector<std::pair<std::string, std::string>> params = {
+    {"ORIGIN", origin},
+#if defined(LIB_PATH)
+    {"LIB", LIB_PATH},
+#else
+#error "LIB_PATH not defined"
+#endif
+  };
   for (auto&& s : runpaths) {
     format_string(&s, params);
   }