aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-11-09 20:49:46 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-09 20:49:46 +0000
commitdf3f8b3158e6f4897cd80e93315dac0f65fe8131 (patch)
tree70cd3965a8778651dca3dc30a3e8eaf8391da5aa
parente6bea58de1762b30d4671b9c06da2fc233585953 (diff)
parent57af753754ff907a6f204c3b3b4ff66e91abf080 (diff)
downloadfutures-executor-df3f8b3158e6f4897cd80e93315dac0f65fe8131.tar.gz
Migrate to cargo_embargo. am: 9de62355ce am: 2ca8d65c8c am: 57af753754
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-executor/+/2822541 Change-Id: I7ffe15a178d08f4905945b72f4db2f9a7f331d9d 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)12
2 files changed, 7 insertions, 7 deletions
diff --git a/Android.bp b/Android.bp
index c11e245..4e65f2c 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 dde71ca..af47ad4 100644
--- a/cargo2android.json
+++ b/cargo_embargo.json
@@ -1,14 +1,14 @@
{
- "apex-available": [
+ "apex_available": [
"//apex_available:platform",
"com.android.btservices",
"com.android.resolv",
"com.android.virt"
],
- "dependencies": true,
- "device": true,
- "features": "thread-pool",
- "min-sdk-version": "29",
- "run": true,
+ "features": [
+ "thread-pool"
+ ],
+ "min_sdk_version": "29",
+ "run_cargo": false,
"tests": true
}