From 3e917872c23eb5e44f0d13167fcd3106b092db5b Mon Sep 17 00:00:00 2001 From: Andrew Walbran Date: Thu, 9 Nov 2023 14:01:43 +0000 Subject: Migrate to cargo_embargo. Bug: 293289578 Test: Ran cargo_embargo, compared Android.bp Change-Id: I8b8472b4e3c896cefbeb7f7d01ab0507271d5f92 --- Android.bp | 4 +--- cargo2android.json | 6 ------ cargo_embargo.json | 4 ++++ 3 files changed, 5 insertions(+), 9 deletions(-) delete mode 100644 cargo2android.json create mode 100644 cargo_embargo.json diff --git a/Android.bp b/Android.bp index a0a56ce..1e48265 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 { @@ -40,7 +40,6 @@ license { rust_library { name: "libquickcheck", - // has rustc warnings host_supported: true, crate_name: "quickcheck", cargo_env_compat: true, @@ -69,7 +68,6 @@ rust_library { rust_test { name: "quickcheck_test_src_lib", - // has rustc warnings host_supported: true, crate_name: "quickcheck", cargo_env_compat: true, diff --git a/cargo2android.json b/cargo2android.json deleted file mode 100644 index cf6ca9c..0000000 --- a/cargo2android.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "dependencies": true, - "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 +} -- cgit v1.2.3