aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-10-23 12:54:49 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-10-23 12:54:49 +0000
commit334a4b4d1ce80fc9ae30a9350c07cc3e4f5e95ac (patch)
treee2caa76fc3ab50f40bd6d716b7789daaa7cb7ebf
parent4b0943f70425eb661e2bbcd9e206f59649b81f92 (diff)
parenta67d260523638d9b442f23bb289b1d8eae0e97eb (diff)
downloadbencher-334a4b4d1ce80fc9ae30a9350c07cc3e4f5e95ac.tar.gz
Migrate to cargo_embargo. am: a67d260523
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/bencher/+/2797709 Change-Id: I33612048c05abfc082e0e724277006a48ae1d293 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 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 @@ license {
rust_test {
name: "bencher_test_lib",
- // has rustc warnings
host_supported: true,
crate_name: "bencher",
cargo_env_compat: true,
@@ -55,7 +54,6 @@ rust_test {
rust_library {
name: "libbencher",
- // has rustc warnings
host_supported: true,
crate_name: "bencher",
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..246281d
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,4 @@
+{
+ "tests": true,
+ "run_cargo": false
+}