summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Martin Stjernholm <mast@google.com> 2020-10-30 02:23:24 +0000
committer Martin Stjernholm <mast@google.com> 2020-11-04 16:28:24 +0000
commit694f0129e6bf106d9f9a7c3bfb3b1cf499e8469b (patch)
tree0d3ed6e495945d9e10b7e1a9cc227e3aa3a43957
parentb5ed330e832e7c08c37f88a3a5fff7dbae17a06b (diff)
Move hardcoded Soong apex_available lines for ART modules into ART
blueprints. Test: m droid Bug: 133140750 Change-Id: I99139a4f8c618f237fa169e125de9479feaeb07f
-rw-r--r--libdexfile/Android.bp5
-rw-r--r--libnativebridge/Android.bp3
-rw-r--r--libnativeloader/Android.bp3
3 files changed, 11 insertions, 0 deletions
diff --git a/libdexfile/Android.bp b/libdexfile/Android.bp
index ca0de289ac..5e5dfa2374 100644
--- a/libdexfile/Android.bp
+++ b/libdexfile/Android.bp
@@ -275,6 +275,8 @@ cc_library_headers {
"//apex_available:platform",
"com.android.art",
"com.android.art.debug",
+ "com.android.media",
+ "com.android.runtime",
],
}
@@ -390,6 +392,9 @@ art_cc_library {
"//apex_available:platform",
"com.android.art",
"com.android.art.debug",
+ "com.android.media",
+ "com.android.media.swcodec",
+ "com.android.runtime",
],
}
diff --git a/libnativebridge/Android.bp b/libnativebridge/Android.bp
index 22349bb487..565ba00be6 100644
--- a/libnativebridge/Android.bp
+++ b/libnativebridge/Android.bp
@@ -24,6 +24,7 @@ cc_library_headers {
"//apex_available:platform",
"com.android.art",
"com.android.art.debug",
+ "com.android.media",
],
}
@@ -78,6 +79,8 @@ cc_library {
],
apex_available: [
"//apex_available:platform",
+ "com.android.media",
+ "com.android.media.swcodec",
],
host_supported: false,
diff --git a/libnativeloader/Android.bp b/libnativeloader/Android.bp
index 9b7ccaf052..dbcde1255b 100644
--- a/libnativeloader/Android.bp
+++ b/libnativeloader/Android.bp
@@ -79,6 +79,8 @@ cc_library {
],
apex_available: [
"//apex_available:platform",
+ "com.android.media",
+ "com.android.media.swcodec",
],
host_supported: false,
srcs: ["native_loader_lazy.cpp"],
@@ -92,6 +94,7 @@ cc_library_headers {
"//apex_available:platform",
"com.android.art",
"com.android.art.debug",
+ "com.android.media",
],
visibility: [
"//art:__subpackages__",