aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-11-29 18:42:20 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-29 18:42:20 +0000
commitcf8aed746d3c24c305869d21aad52a8a25d56da7 (patch)
treea268b72ebc3307f8dd747b4c84ac7cf6f2c4c561
parent144a3aff1cbc92e0b46aebe819e7cad68cbedd61 (diff)
parentfc7c8987d516e8f1bd555daf22054b27732ba979 (diff)
downloadutf-8-cf8aed746d3c24c305869d21aad52a8a25d56da7.tar.gz
Migrate to cargo_embargo. am: 251a0c3b9f am: fc7c8987d5
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/utf-8/+/2852606 Change-Id: I285df8904d28ea8ea3d0b6c95314d1157ef33e2c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp8
-rw-r--r--cargo2android.json5
-rw-r--r--cargo_embargo.json4
3 files changed, 6 insertions, 11 deletions
diff --git a/Android.bp b/Android.bp
index a317bf5..62a7c18 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,8 +1,6 @@
-// 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.
-
-
rust_library {
name: "libutf8",
host_supported: true,
@@ -32,7 +30,5 @@ rust_test {
unit_test: true,
},
edition: "2015",
- rustlibs: [
- "libutf8",
- ],
+ rustlibs: ["libutf8"],
}
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index aefb658..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "run": true,
- "device": true,
- "tests": true
-}
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
+}