From e90c88724d3054e3dfc3da45f382dc2511ea06b4 Mon Sep 17 00:00:00 2001 From: Andrew Walbran Date: Fri, 10 Nov 2023 17:03:41 +0000 Subject: Migrate to cargo_embargo. Bug: 293289578 Test: Ran cargo_embargo, compared Android.bp Change-Id: I9d4ebb76b4f1b247e2f938fd8ec6ae970c0ebaef --- Android.bp | 3 +-- cargo2android.json | 6 ------ cargo_embargo.json | 6 ++++++ 3 files changed, 7 insertions(+), 8 deletions(-) delete mode 100644 cargo2android.json create mode 100644 cargo_embargo.json diff --git a/Android.bp b/Android.bp index d9679a9..a73f3bf 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 { @@ -41,7 +41,6 @@ license { rust_library { name: "libfallible_streaming_iterator", - // has rustc warnings host_supported: true, crate_name: "fallible_streaming_iterator", cargo_env_compat: true, diff --git a/cargo2android.json b/cargo2android.json deleted file mode 100644 index fba20cf..0000000 --- a/cargo2android.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "device": true, - "features": "std", - "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..f1149bc --- /dev/null +++ b/cargo_embargo.json @@ -0,0 +1,6 @@ +{ + "features": [ + "std" + ], + "tests": true +} -- cgit v1.2.3