aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-11-08 22:49:19 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-08 22:49:19 +0000
commit020983070eb564e6efb2b33acece9b67c069d801 (patch)
tree673580abd605906c3c8976bcd2fe11981e9b2df5
parentbe096345b4f93afd8d5a3b324c463d6a9af3a09c (diff)
parentdd0b6441d5ef5336ec06afbb843afdbbcf330879 (diff)
downloadcast-020983070eb564e6efb2b33acece9b67c069d801.tar.gz
Migrate to cargo_embargo. am: e5d8474b88 am: 01919df64d am: dd0b6441d5
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/cast/+/2822151 Change-Id: Ie04c3958abae740253fcef54914772bec3f61592 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 d272d39..b09889c 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 {
@@ -39,7 +39,6 @@ license {
rust_test {
name: "cast_test_src_lib",
- // has rustc warnings
host_supported: true,
crate_name: "cast",
cargo_env_compat: true,
@@ -51,14 +50,11 @@ rust_test {
unit_test: true,
},
edition: "2018",
- rustlibs: [
- "libquickcheck",
- ],
+ rustlibs: ["libquickcheck"],
}
rust_library {
name: "libcast",
- // has rustc warnings
host_supported: true,
crate_name: "cast",
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
+}