aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-11-08 19:22:12 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-08 19:22:12 +0000
commit290f15d0e97b2e3c7bcbfcf2a2cf643911f044c6 (patch)
tree97bf39561f8ae2b48d305a6632770402e598c3a0
parentef9f2916271a94372e8c94a7f7c6e19c7f3aac9d (diff)
parent499e1e0324d8548ce312605ecd1f14c85ad4db8a (diff)
downloadfutures-test-290f15d0e97b2e3c7bcbfcf2a2cf643911f044c6.tar.gz
Migrate to cargo_embargo. am: 16a2c62f18 am: 499e1e0324
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-test/+/2815987 Change-Id: Ifa8f680a4741f240536e67e3688a353fd6261314 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp2
-rw-r--r--cargo2android.json6
-rw-r--r--cargo_embargo.json4
3 files changed, 5 insertions, 7 deletions
diff --git a/Android.bp b/Android.bp
index e4bf421..994a5b8 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 3ebdf72..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "dependencies": true,
- "device": true,
- "run": true,
- "tests": true
-}
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..246281d
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,4 @@
+{
+ "tests": true,
+ "run_cargo": false
+}