aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-10-18 18:51:30 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-10-18 18:51:30 +0000
commit37d065cc93c720c4c2d100385b6d872106bf5a9e (patch)
tree30f64060f4f8327a6804329ac92f14fae41b8650
parent5b77ed259ba0f1b213b82fe41ccd919cc0e12974 (diff)
parent66505cb19996568d6f7069986c8adc8cd9241bf0 (diff)
downloadfutures-util-37d065cc93c720c4c2d100385b6d872106bf5a9e.tar.gz
Migrate to cargo_embargo. am: 66505cb199
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-util/+/2796433 Change-Id: Id06092ff8f1c424a7d71c9701c12b38511371dbf Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp2
-rw-r--r--cargo2android.json14
-rw-r--r--cargo_embargo.json18
3 files changed, 19 insertions, 15 deletions
diff --git a/Android.bp b/Android.bp
index 929d46b..60e4e8e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --config cargo2android.json.
+// This file is generated by cargo_embargo.
// Do not modify this file as changes will be overridden on upgrade.
package {
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index 185661c..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "apex-available": [
- "//apex_available:platform",
- "com.android.btservices",
- "com.android.resolv",
- "com.android.virt"
- ],
- "dependencies": true,
- "device": true,
- "features": "channel,default,io,memchr,sink",
- "min-sdk-version": "29",
- "run": true,
- "tests": true
-}
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..892125c
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,18 @@
+{
+ "tests": true,
+ "features": [
+ "channel",
+ "default",
+ "io",
+ "memchr",
+ "sink"
+ ],
+ "apex_available": [
+ "//apex_available:platform",
+ "com.android.btservices",
+ "com.android.resolv",
+ "com.android.virt"
+ ],
+ "min_sdk_version": "29",
+ "run_cargo": false
+}