aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElisei Zamakhov <elisei@google.com>2023-04-25 11:10:38 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-04-25 11:10:38 +0000
commit96855afa443beaafe3bda8e3b11a5bc1e04318c3 (patch)
tree5299af410b0bdd7da87dd801e011f6067a98aae1
parentc9863ffb897a74a044e99a57d64bce42b0c1a842 (diff)
parent1f7eecf1b2945f2d4ab0353963558a0f326e9481 (diff)
downloadatomic-96855afa443beaafe3bda8e3b11a5bc1e04318c3.tar.gz
Make rust atomic other apex avaliable am: 836c509fd3 am: b5c485fdad am: 1f7eecf1b2
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/atomic/+/2554116 Change-Id: Iddfeb177828d8e0697acb91a548338a8b0722b19 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp2
-rw-r--r--cargo2android.json8
2 files changed, 6 insertions, 4 deletions
diff --git a/Android.bp b/Android.bp
index 9477915..737f9db 100644
--- a/Android.bp
+++ b/Android.bp
@@ -62,8 +62,8 @@ rust_library {
"has_atomic_u8",
],
apex_available: [
+ "//apex_available:anyapex",
"//apex_available:platform",
- "com.android.virt",
],
product_available: true,
vendor_available: true,
diff --git a/cargo2android.json b/cargo2android.json
index 5871db7..2c7c60b 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -1,10 +1,12 @@
{
"apex-available": [
- "//apex_available:platform",
- "com.android.virt"
+ "//apex_available:anyapex",
+ "//apex_available:platform"
],
"dependencies": true,
"device": true,
"features": "fallback,std",
- "run": true
+ "run": true,
+ "vendor-available": true,
+ "product-available": true
}