summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-11-14 04:32:14 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-14 04:32:14 +0000
commit82698405c614b263916c8265c3b33fb6f39df9dd (patch)
treed37662732ec4949376a31d1c52ec36ace68da443
parentae46e333faaaead5da939c8b3f61cf268f0d3300 (diff)
parent21ab66ac44ca85d3c1f1c688f06c0f0c4bc071f3 (diff)
downloadfutures-macro-82698405c614b263916c8265c3b33fb6f39df9dd.tar.gz
Migrate to cargo_embargo. am: 95be593d39 am: 4c6b40707a am: 21ab66ac44
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-macro/+/2824494 Change-Id: Ib47e78588ec29c1c9ce5e1bb583401ecf139f694 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp2
-rw-r--r--cargo2android.json3
-rw-r--r--cargo_embargo.json8
3 files changed, 9 insertions, 4 deletions
diff --git a/Android.bp b/Android.bp
index a7004bf..452b349 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 958632b..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "run": true
-} \ No newline at end of file
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..2cd9227
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,8 @@
+{
+ "package": {
+ "futures-macro": {
+ "device_supported": false
+ }
+ },
+ "run_cargo": false
+}