summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Martin Stjernholm <mast@google.com> 2020-10-30 02:27:23 +0000
committer Martin Stjernholm <mast@google.com> 2020-11-04 16:28:24 +0000
commitb5ed330e832e7c08c37f88a3a5fff7dbae17a06b (patch)
tree48aabacb8b9825ba29e9ec6ab787ea28c40eab78
parent39aa4be302d17797281ca6b96d5f0e26cdaeea91 (diff)
Fix missing //apex_available:platform on some libs.
They're used from platform libs, e.g. libandroid_runtime. Also changed the *_lazy shims to use the more precise runtime_libs for their dlopen dependencies. Test: m Bug: 133140750 Change-Id: I4a3f1af6155b414aed4aac7a28365177ea1ae716
-rw-r--r--libnativebridge/Android.bp5
-rw-r--r--libnativeloader/Android.bp5
2 files changed, 8 insertions, 2 deletions
diff --git a/libnativebridge/Android.bp b/libnativebridge/Android.bp
index dc5363473c..22349bb487 100644
--- a/libnativebridge/Android.bp
+++ b/libnativebridge/Android.bp
@@ -76,10 +76,13 @@ cc_library {
"//frameworks/native/opengl/libs",
"//frameworks/native/vulkan/libvulkan",
],
+ apex_available: [
+ "//apex_available:platform",
+ ],
host_supported: false,
srcs: ["native_bridge_lazy.cc"],
- required: ["libnativebridge"],
+ runtime_libs: ["libnativebridge"],
shared_libs: ["liblog"],
}
diff --git a/libnativeloader/Android.bp b/libnativeloader/Android.bp
index 54c60053c2..9b7ccaf052 100644
--- a/libnativeloader/Android.bp
+++ b/libnativeloader/Android.bp
@@ -77,9 +77,12 @@ cc_library {
"//frameworks/native/opengl/libs",
"//frameworks/native/vulkan/libvulkan",
],
+ apex_available: [
+ "//apex_available:platform",
+ ],
host_supported: false,
srcs: ["native_loader_lazy.cpp"],
- required: ["libnativeloader"],
+ runtime_libs: ["libnativeloader"],
shared_libs: ["liblog"],
}