commit f8ebfa095bad3e02e11128ffc8f8e72db9e8756c
author Elisei Zamakhov <elisei@google.com> Mon Apr 24 23:56:58 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Apr 24 23:56:58 2023 +0000
tree 16197cd9b002e2c8cd7cde6918bd39b41753882c
parent f9551be63242edf33268776fd81b1c30ec8dbe80
parent 4e46baf2c89640e1695827a986daea3194300152

Allow libthiserror to be used in other apex am: ca3ea55855 am: 50d8c39263 am: 4e46baf2c8

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/thiserror/+/2554115

Change-Id: Ie7a38e9ab32f2fc952c5155ba98375b7b44ea059
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Android.bp

diff --git a/Android.bp b/Android.bp
index 8081558..1446b46 100644
--- a/Android.bp
+++ b/Android.bp
@@ -48,12 +48,8 @@
     cfgs: ["provide_any"],
     proc_macros: ["libthiserror_impl"],
     apex_available: [
+        "//apex_available:anyapex",
         "//apex_available:platform",
-        "com.android.btservices",
-        "com.android.compos",
-        "com.android.resolv",
-        "com.android.uwb",
-        "com.android.virt",
     ],
     product_available: true,
     vendor_available: true,

cargo2android.json

diff --git a/cargo2android.json b/cargo2android.json
index 7d5c2b4..aba94bd 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -1,11 +1,7 @@
 {
   "apex-available": [
-    "//apex_available:platform",
-    "com.android.btservices",
-    "com.android.compos",
-    "com.android.resolv",
-    "com.android.uwb",
-    "com.android.virt"
+    "//apex_available:anyapex",
+    "//apex_available:platform"
   ],
   "dependencies": true,
   "device": true,