aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-11-11 11:33:49 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-11 11:33:49 +0000
commit8eebaa9e0f318df1ac79b453a25ccf5b68232d38 (patch)
treecaaf1b77ee990f6f30efa6fd0d3332b1b84420e0
parentb9f17ee2f06b5d2a1130cd5b8cf2bafdf986abc1 (diff)
parent82289c187c113c26b15deb1c436cfd3ccc01620b (diff)
downloadfutures-core-8eebaa9e0f318df1ac79b453a25ccf5b68232d38.tar.gz
Migrate to cargo_embargo. am: defb1ef178 am: 82289c187c
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-core/+/2824675 Change-Id: If2dceb97b9dc3c3a78237893fd6c64711c4eb2b2 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 62feb3b..e5a5cf3 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
}