aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-10-18 19:49:02 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-10-18 19:49:02 +0000
commite56fc88578c34f586108ecea7b96e46a39f39caf (patch)
tree7da7ef40f6c8637accffeb7b81e80b2d09d382af
parent5c966dcb7904ed2cf81c3df744be602a0f0460c7 (diff)
parent1002ff2020bfe5d32f096fbee9b4f4c45a6045db (diff)
downloadasync-task-e56fc88578c34f586108ecea7b96e46a39f39caf.tar.gz
Migrate to cargo_embargo. am: 93b21ad4eb am: f02ee5a184 am: 1002ff2020
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/async-task/+/2796114 Change-Id: Ie83311c8edcbce843b2a5e6c2b93cfa58b0c68f2 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, 4 insertions, 5 deletions
diff --git a/Android.bp b/Android.bp
index 8841f13..d7c98f5 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 707d26c..fbb9fcd 100644
--- a/cargo2android.json
+++ b/cargo_embargo.json
@@ -1,8 +1,7 @@
{
- "apex-available": [
+ "apex_available": [
"//apex_available:platform",
"com.android.virt"
],
- "device": true,
- "run": true
-} \ No newline at end of file
+ "run_cargo": false
+}