From b6eaca7d40de6bd25c3111e0e81aab8b2f2ac6d6 Mon Sep 17 00:00:00 2001 From: Andrew Walbran Date: Mon, 13 Nov 2023 17:15:46 +0000 Subject: Migrate to cargo_embargo. Bug: 293289578 Test: Ran cargo_embargo, compared Android.bp Change-Id: I0da4fd62b87647ef85e01bae8e50cb6617a3059c --- Android.bp | 8 ++------ cargo2android.json | 4 ---- cargo_embargo.json | 11 +++++++++++ 3 files changed, 13 insertions(+), 10 deletions(-) delete mode 100644 cargo2android.json create mode 100644 cargo_embargo.json diff --git a/Android.bp b/Android.bp index 19ee651..f89d2aa 100644 --- a/Android.bp +++ b/Android.bp @@ -1,8 +1,6 @@ -// 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_host { name: "libserde_spanned", crate_name: "serde_spanned", @@ -11,7 +9,5 @@ rust_library_host { srcs: ["src/lib.rs"], edition: "2021", features: ["serde"], - rustlibs: [ - "libserde", - ], + rustlibs: ["libserde"], } diff --git a/cargo2android.json b/cargo2android.json deleted file mode 100644 index 62f757a..0000000 --- a/cargo2android.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "features": "serde", - "run": true -} \ No newline at end of file diff --git a/cargo_embargo.json b/cargo_embargo.json new file mode 100644 index 0000000..249bfe0 --- /dev/null +++ b/cargo_embargo.json @@ -0,0 +1,11 @@ +{ + "features": [ + "serde" + ], + "package": { + "serde_spanned": { + "device_supported": false + } + }, + "run_cargo": false +} -- cgit v1.2.3