From 3b9df37088a149f10f331cd8cd2da083e7b9351e Mon Sep 17 00:00:00 2001 From: Andrew Walbran Date: Mon, 13 Nov 2023 17:24:25 +0000 Subject: Migrate to cargo_embargo. Bug: 293289578 Test: Ran cargo_embargo, compared Android.bp Change-Id: Ib119f0222706730033c41971178ae97ce8d43642 --- Android.bp | 5 +---- cargo2android.json | 5 ----- cargo_embargo.json | 11 +++++++++++ 3 files changed, 12 insertions(+), 9 deletions(-) delete mode 100644 cargo2android.json create mode 100644 cargo_embargo.json diff --git a/Android.bp b/Android.bp index 13b6346..e83f278 100644 --- a/Android.bp +++ b/Android.bp @@ -1,11 +1,8 @@ -// 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. - - rust_library { name: "libtracing_subscriber", - // has rustc warnings host_supported: true, crate_name: "tracing_subscriber", cargo_env_compat: true, diff --git a/cargo2android.json b/cargo2android.json deleted file mode 100644 index 77581cf..0000000 --- a/cargo2android.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "device": true, - "run": true, - "features": "alloc,std,smallvec,parking_lot,fmt,registry" -} \ No newline at end of file diff --git a/cargo_embargo.json b/cargo_embargo.json new file mode 100644 index 0000000..c9709e0 --- /dev/null +++ b/cargo_embargo.json @@ -0,0 +1,11 @@ +{ + "features": [ + "alloc", + "std", + "smallvec", + "parking_lot", + "fmt", + "registry" + ], + "run_cargo": false +} -- cgit v1.2.3