aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Scull <ascull@google.com>2022-06-30 16:09:26 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-06-30 16:09:26 +0000
commitb801eef95bb05e44bdfbb457098e7eec5ceb069f (patch)
tree94053226f1ab00f2393b48ea1e6ce7d3cbbe20be
parent54013c29158b978b15357e4c6d4948213414b4db (diff)
parente707e18e230d0ddeb2025b998a000fba441b50b3 (diff)
downloadscopeguard-b801eef95bb05e44bdfbb457098e7eec5ceb069f.tar.gz
Make available to all APEXs and vendor code am: 362f22471e am: e707e18e23
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/scopeguard/+/2141973 Change-Id: Iee88c0206941203eb90218fc4ae79f195672a5b5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp5
-rw-r--r--cargo2android.json9
2 files changed, 4 insertions, 10 deletions
diff --git a/Android.bp b/Android.bp
index 2034097..ce76b7a 100644
--- a/Android.bp
+++ b/Android.bp
@@ -51,10 +51,9 @@ rust_library {
],
apex_available: [
"//apex_available:platform",
- "com.android.bluetooth",
- "com.android.compos",
- "com.android.virt",
+ "//apex_available:anyapex",
],
+ vendor_available: true,
min_sdk_version: "29",
}
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
}