aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-11-14 13:19:31 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-14 13:19:31 +0000
commit8783035a4fb50b82cddc3084d243f4961d372767 (patch)
tree481daaf95f5d40b05519180575b30a7c148e8a70
parentc8b30084cb41ddd65dfcc62ad2aeaefcb6ddd55f (diff)
parent57f7c032aa71c8522405a534e5e13615184313e6 (diff)
downloadunicode-xid-8783035a4fb50b82cddc3084d243f4961d372767.tar.gz
Migrate to cargo_embargo. am: 57f7c032aa
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/unicode-xid/+/2828135 Change-Id: I18c6713eb0b54895d936e7d7e38c759af5be37a0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp6
-rw-r--r--cargo2android.json5
-rw-r--r--cargo_embargo.json4
3 files changed, 6 insertions, 9 deletions
diff --git a/Android.bp b/Android.bp
index 18d1eed..0f4ab8c 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 {
@@ -69,9 +69,7 @@ rust_test {
},
edition: "2015",
features: ["default"],
- rustlibs: [
- "libcriterion",
- ],
+ rustlibs: ["libcriterion"],
}
rust_test {
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index d36fb44..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "device": true,
- "run": true,
- "tests": true
-} \ No newline at end of file
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..c8842d1
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,4 @@
+{
+ "run_cargo": false,
+ "tests": true
+}