commit 57b9d1e6c077bb348066115707763d8ae7d924d1
author Jiyong Park <jiyong@google.com> Thu Jan 17 03:14:45 2019 +0900
committer Jiyong Park <jiyong@google.com> Thu Jan 24 17:00:37 2019 +0900
tree c47a510f119df45fef6c7ff0abeeea61c216a592
parent 301f6f3e3731cf4b146adfbea3b05e41be0da0b4

support LIB in runpath

In addition to ORIGIN, LIB is now expanded to either lib or lib64
depending on the ABI in the DT_RUNPATH.

Test: To be added (can't be added to AOSP directly since there are
internal tests that have to be updated as well)

Change-Id: I34a8316f1765a27c731bc270ee25c0ce287d7eed

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",
         },
     },