aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-11-14 13:48:38 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-14 13:48:38 +0000
commitf56b1fd10b9972b51c478d938cba618eda15dc93 (patch)
tree667f6b9506de920304c9ff0dd6fc073fcb925e61
parent390a927013a1de7a4769c8e49590b30f75540610 (diff)
parent5097bb25949d90053b9be02dbc787a286308c08e (diff)
downloadscopeguard-f56b1fd10b9972b51c478d938cba618eda15dc93.tar.gz
Migrate to cargo_embargo. am: 0e6f36886f am: 5097bb2594
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/scopeguard/+/2828110 Change-Id: I289643697243a5af07554efa54fb47472be06e71 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp2
-rw-r--r--cargo2android.json8
-rw-r--r--cargo_embargo.json5
3 files changed, 6 insertions, 9 deletions
diff --git a/Android.bp b/Android.bp
index a785207..3d212ac 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/cargo2android.json
deleted file mode 100644
index 0bf05f4..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "dependencies": true,
- "device": true,
- "min-sdk-version": "29",
- "run": true,
- "tests": true,
- "vendor-available": true
-}
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..16616e0
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,5 @@
+{
+ "min_sdk_version": "29",
+ "run_cargo": false,
+ "tests": true
+}