commit 5cdbccfe34c6bfe20e9cae6d2f594f6e25483232
author Andrew Scull <ascull@google.com> Thu Jun 30 16:43:11 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jun 30 16:43:11 2022 +0000
tree 94053226f1ab00f2393b48ea1e6ce7d3cbbe20be
parent 400bd46cd5e5f7c69810be0a431e1d08f0c58282
parent 4595ea2e8d63da16bbe86d44e1da184f0681352f

Make available to all APEXs and vendor code am: 362f22471e am: e707e18e23 am: b801eef95b am: 4595ea2e8d

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

Change-Id: I4736d3364f745cdaa296ce83cdf816b70622969e
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 2034097..ce76b7a 100644
--- a/Android.bp
+++ b/Android.bp
@@ -51,10 +51,9 @@
     ],
     apex_available: [
         "//apex_available:platform",
-        "com.android.bluetooth",
-        "com.android.compos",
-        "com.android.virt",
+        "//apex_available:anyapex",
     ],
+    vendor_available: true,
     min_sdk_version: "29",
 }
 

cargo2android.json

diff --git a/cargo2android.json b/cargo2android.json
index 4384672..0bf05f4 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -1,13 +1,8 @@
 {
-  "apex-available": [
-    "//apex_available:platform",
-    "com.android.bluetooth",
-    "com.android.compos",
-    "com.android.virt"
-  ],
   "dependencies": true,
   "device": true,
   "min-sdk-version": "29",
   "run": true,
-  "tests": true
+  "tests": true,
+  "vendor-available": true
 }