aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSeth Moore <sethmo@google.com>2022-10-04 17:13:00 -0700
committerSeth Moore <sethmo@google.com>2022-10-04 17:13:00 -0700
commit183b4575dd876694c13e2eb33f78c5ba1b6fa245 (patch)
treef437205a291802a8ef56681d81b6dc804a1bfd6b
parent8c29fe4f947ba30893106c7fa7757084d37ba183 (diff)
downloadanyhow-183b4575dd876694c13e2eb33f78c5ba1b6fa245.tar.gz
Remove explicit apex list from build rules
The default is to allow linking into any apex, so rely on that now instead of extending the list of explicit apexes in cargo2android Test: Build Change-Id: I533ba5faa62de120638c84b7b36c5e590e352b0f
-rw-r--r--Android.bp6
-rw-r--r--cargo2android.json8
2 files changed, 1 insertions, 13 deletions
diff --git a/Android.bp b/Android.bp
index 1472c48..45bde32 100644
--- a/Android.bp
+++ b/Android.bp
@@ -193,11 +193,7 @@ rust_library {
],
apex_available: [
"//apex_available:platform",
- "com.android.btservices",
- "com.android.compos",
- "com.android.resolv",
- "com.android.uwb",
- "com.android.virt",
+ "//apex_available:anyapex",
],
vendor_available: true,
min_sdk_version: "29",
diff --git a/cargo2android.json b/cargo2android.json
index b50ec11..adb0d01 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -1,12 +1,4 @@
{
- "apex-available": [
- "//apex_available:platform",
- "com.android.btservices",
- "com.android.compos",
- "com.android.resolv",
- "com.android.uwb",
- "com.android.virt"
- ],
"dependencies": true,
"dependency-blocklist": [
"rustversion",