commit c493d58588c26bb86e2d4dd1109d661d3c0354ba
author Andrew Walbran <qwandor@google.com> Mon Oct 23 12:52:53 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Oct 23 12:52:53 2023 +0000
tree e2caa76fc3ab50f40bd6d716b7789daaa7cb7ebf
parent 1a1ecb4043c57ee8f6071fc24cefe2cde0e54293
parent a67d260523638d9b442f23bb289b1d8eae0e97eb

Migrate to cargo_embargo. am: a67d260523

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/bencher/+/2797709

Change-Id: I39715d6c82dadd8cfa083db02fb8b763fd93c10c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Android.bp

diff --git a/Android.bp b/Android.bp
index cc833f7..e50cb52 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 @@
 
 rust_test {
     name: "bencher_test_lib",
-    // has rustc warnings
     host_supported: true,
     crate_name: "bencher",
     cargo_env_compat: true,
@@ -55,7 +54,6 @@
 
 rust_library {
     name: "libbencher",
-    // has rustc warnings
     host_supported: true,
     crate_name: "bencher",
     cargo_env_compat: true,

cargo2android.json

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

cargo_embargo.json

diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..246281d
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,4 @@
+{
+  "tests": true,
+  "run_cargo": false
+}