aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-11-10 19:36:05 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-10 19:36:05 +0000
commitb93a86dde3084a93d8b6b638ce69d4dc42173cf6 (patch)
tree012c6708f5fc1f6e6b174eb6a0d020847568fd97
parentfcb45f72332fb593c48eeb9632c678200f064652 (diff)
parentbc7b9aa67580f14141a6bd52b7a977f1928a7e1b (diff)
downloadfutures-sink-b93a86dde3084a93d8b6b638ce69d4dc42173cf6.tar.gz
Migrate to cargo_embargo. am: 9f39086c22 am: bc7b9aa675
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-sink/+/2826474 Change-Id: I5748ad8d4110c657c75e59c2ee42d996f83440bc 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)7
2 files changed, 3 insertions, 6 deletions
diff --git a/Android.bp b/Android.bp
index e394f70..8d6e11f 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 b98d10b..12fc32c 100644
--- a/cargo2android.json
+++ b/cargo_embargo.json
@@ -1,13 +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",
"tests": true
}