aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Stjernholm <mast@google.com>2019-11-07 03:16:22 -0800
committerandroid-build-merger <android-build-merger@google.com>2019-11-07 03:16:22 -0800
commite116a9634a582697c290c2df4e988d9fe8408b4c (patch)
tree18d087bd52969a52d4f9b9242b82986cbddf0468
parent985729f34a75e26c6f581ececbf778cae116d036 (diff)
parentde246b23185f87e6e107f5aa2abf1ed2e4d65674 (diff)
downloadbionic-e116a9634a582697c290c2df4e988d9fe8408b4c.tar.gz
Merge "Add libdl_android to the Runtime APEX." am: 77e910d337
am: de246b2318 Change-Id: Icba116669f30fd8f0636307f9e24fab0f8d14800
-rw-r--r--apex/Android.bp1
-rw-r--r--libdl/Android.bp5
2 files changed, 6 insertions, 0 deletions
diff --git a/apex/Android.bp b/apex/Android.bp
index 276541e22..4fbbec109 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -29,6 +29,7 @@ apex {
"libc",
"libm",
"libdl",
+ "libdl_android",
"libc_malloc_debug",
"libc_malloc_hooks",
],
diff --git a/libdl/Android.bp b/libdl/Android.bp
index 15263e90b..9daa9c433 100644
--- a/libdl/Android.bp
+++ b/libdl/Android.bp
@@ -185,6 +185,11 @@ cc_library {
symbol_file: "libdl_android.map.txt",
versions: ["10000"],
},
+
+ apex_available: [
+ "//apex_available:platform",
+ "com.android.runtime",
+ ],
}
ndk_library {