From a67d260523638d9b442f23bb289b1d8eae0e97eb Mon Sep 17 00:00:00 2001 From: Andrew Walbran Date: Mon, 23 Oct 2023 12:11:24 +0100 Subject: Migrate to cargo_embargo. Bug: 293289578 Test: Ran cargo_embargo, compared Android.bp. Change-Id: I2b68faa9d4a870d76d763548ceaa12a249d7ac0e --- Android.bp | 4 +--- cargo2android.json | 5 ----- cargo_embargo.json | 4 ++++ 3 files changed, 5 insertions(+), 8 deletions(-) delete mode 100644 cargo2android.json create mode 100644 cargo_embargo.json 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 +} -- cgit v1.2.3