aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-11-14 20:05:53 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-14 20:05:53 +0000
commit214a0f31457d88dbc95bec6e23ae427b6004d889 (patch)
tree10b0e6036fd941c03792a6d7e936c7ba1eeac561
parentf17b2aec00820c62cfdfdbe237796d8397a13d6e (diff)
parent82503a923a456749d14ab64a92649bd2b89e4a96 (diff)
downloadfutures-214a0f31457d88dbc95bec6e23ae427b6004d889.tar.gz
Migrate to cargo_embargo. am: 5f402752c8 am: 7eca10697a am: 82503a923a
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures/+/2829796 Change-Id: I6a82e09df2062e69bae8bf5730c558e733922f22 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp2
-rw-r--r--cargo_embargo.json (renamed from cargo2android.json)8
2 files changed, 4 insertions, 6 deletions
diff --git a/Android.bp b/Android.bp
index 2a41329..46c18a2 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/cargo_embargo.json
index 7b27fc0..76e999c 100644
--- a/cargo2android.json
+++ b/cargo_embargo.json
@@ -1,12 +1,10 @@
{
- "apex-available": [
+ "apex_available": [
"//apex_available:platform",
"com.android.btservices",
"com.android.resolv",
"com.android.virt"
],
- "dependencies": true,
- "device": true,
- "min-sdk-version": "29",
- "run": true
+ "min_sdk_version": "29",
+ "run_cargo": false
}