commit 77e910d33739b7cdd71b1f9d8b03ca1878549fc6
author Martin Stjernholm <mast@google.com> Thu Nov 07 11:01:36 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Nov 07 11:01:36 2019 +0000
tree 18d087bd52969a52d4f9b9242b82986cbddf0468
parent 2fead5fd89d47dd73df1de21e11d8e562372aa1a
parent a3b0eab32fc7112277f8aef824a0a211e2dacf1e

Merge "Add libdl_android to the Runtime APEX."

apex/Android.bp

diff --git a/apex/Android.bp b/apex/Android.bp
index 276541e..4fbbec1 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -29,6 +29,7 @@
         "libc",
         "libm",
         "libdl",
+        "libdl_android",
         "libc_malloc_debug",
         "libc_malloc_hooks",
     ],

libdl/Android.bp

diff --git a/libdl/Android.bp b/libdl/Android.bp
index 15263e9..9daa9c4 100644
--- a/libdl/Android.bp
+++ b/libdl/Android.bp
@@ -185,6 +185,11 @@
         symbol_file: "libdl_android.map.txt",
         versions: ["10000"],
     },
+
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.runtime",
+    ],
 }
 
 ndk_library {