aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-11-14 01:10:19 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-14 01:10:19 +0000
commitcabb9038e9500632bc5af0edbaf59f74e5996ad7 (patch)
treeeac10bd4e4e7f03e3d2bcede5d40fdbb5ae51503
parent473681c8434837021faf0d0b9fd78c03f39cdd4e (diff)
parent6b4947a082ca961998bfedf303d3118d7b8ba19e (diff)
downloadunicode-width-cabb9038e9500632bc5af0edbaf59f74e5996ad7.tar.gz
Migrate to cargo_embargo. am: 99d47778c2 am: 6b4947a082
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/unicode-width/+/2828074 Change-Id: I6b9169a5a2f5c228a5828737751008347a535d0a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp4
-rw-r--r--cargo2android.json5
-rw-r--r--cargo_embargo.json4
3 files changed, 5 insertions, 8 deletions
diff --git a/Android.bp b/Android.bp
index cec614d..f988879 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 {
@@ -40,7 +40,6 @@ license {
rust_library {
name: "libunicode_width",
- // has rustc warnings
host_supported: true,
crate_name: "unicode_width",
cargo_env_compat: true,
@@ -58,7 +57,6 @@ rust_library {
rust_test {
name: "unicode-width_test_src_lib",
- // has rustc warnings
host_supported: true,
crate_name: "unicode_width",
cargo_env_compat: true,
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
+}