aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElisei Zamakhov <elisei@google.com>2023-04-24 23:56:58 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-04-24 23:56:58 +0000
commitf8ebfa095bad3e02e11128ffc8f8e72db9e8756c (patch)
tree16197cd9b002e2c8cd7cde6918bd39b41753882c
parentf9551be63242edf33268776fd81b1c30ec8dbe80 (diff)
parent4e46baf2c89640e1695827a986daea3194300152 (diff)
downloadthiserror-f8ebfa095bad3e02e11128ffc8f8e72db9e8756c.tar.gz
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>
-rw-r--r--Android.bp6
-rw-r--r--cargo2android.json8
2 files changed, 3 insertions, 11 deletions
diff --git a/Android.bp b/Android.bp
index 8081558..1446b46 100644
--- a/Android.bp
+++ b/Android.bp
@@ -48,12 +48,8 @@ rust_library {
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,
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,