aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-10-18 17:52:00 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-10-18 17:52:00 +0000
commitf49da93a86b1f70048b90bf411c27e6a0c1585dd (patch)
tree1e2e44f1cf8a8b35459c2aa75855d71fa508cbac
parent9c8dbc2052d8e74a8625e1e833ba962af78a191e (diff)
parent97e013e49b697d30c7ca1e56d00dd92f559833d1 (diff)
downloadfutures-task-f49da93a86b1f70048b90bf411c27e6a0c1585dd.tar.gz
Migrate to cargo_embargo. am: 97e013e49b
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-task/+/2796115 Change-Id: If3609bc6dd6c7e276c88b131091ab3988f97bf05 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp2
-rw-r--r--cargo2android.json13
-rw-r--r--cargo_embargo.json11
3 files changed, 12 insertions, 14 deletions
diff --git a/Android.bp b/Android.bp
index fa41b4f..9d860b0 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 b98d10b..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
- "apex-available": [
- "//apex_available:platform",
- "com.android.btservices",
- "com.android.resolv",
- "com.android.virt"
- ],
- "dependencies": true,
- "device": true,
- "min-sdk-version": "29",
- "run": true,
- "tests": true
-}
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..f5493cb
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,11 @@
+{
+ "tests": true,
+ "apex_available": [
+ "//apex_available:platform",
+ "com.android.btservices",
+ "com.android.resolv",
+ "com.android.virt"
+ ],
+ "min_sdk_version": "29",
+ "run_cargo": false
+}