aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2021-10-08 21:52:30 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-10-08 21:52:30 +0000
commit36b36e2055cecc2598584bd99c821feacb4189f7 (patch)
tree561e3a4b92cd59e668483e633826cc38a8f3be38
parent0eec5fc28399b78a2d912312ffe0d6dd4060216c (diff)
parent91027bdf55a1e61f35467d8f7eb47736f7b31284 (diff)
downloadcrossbeam-queue-36b36e2055cecc2598584bd99c821feacb4189f7.tar.gz
Merge "Add apex to crossbeam-queue rust crate" am: f78f73ccf4 am: 0eb300f993 am: 249c694a40 am: e3245f3911 am: 91027bdf55
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/crossbeam-queue/+/1850753 Change-Id: I2c885d3dc41d0c03b22f7787dd803658e77bf34e
-rw-r--r--Android.bp6
-rw-r--r--cargo2android.json4
2 files changed, 8 insertions, 2 deletions
diff --git a/Android.bp b/Android.bp
index 017fe82..8589c95 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,8 +1,6 @@
// This file is generated by cargo2android.py --config cargo2android.json.
// Do not modify this file as changes will be overridden on upgrade.
-
-
package {
default_applicable_licenses: [
"external_rust_crates_crossbeam-queue_license",
@@ -143,4 +141,8 @@ rust_library {
"libcfg_if",
"libcrossbeam_utils",
],
+ apex_available: [
+ "//apex_available:platform",
+ "com.android.virt",
+ ],
}
diff --git a/cargo2android.json b/cargo2android.json
index d36fb44..6e516e0 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -1,4 +1,8 @@
{
+ "apex-available": [
+ "//apex_available:platform",
+ "com.android.virt"
+ ],
"device": true,
"run": true,
"tests": true