From efe366f7f849abeafcb4bc7d5eb935793974f973 Mon Sep 17 00:00:00 2001 From: Andrew Walbran Date: Thu, 16 Nov 2023 12:35:21 +0000 Subject: Migrate to cargo_embargo. Bug: 293289578 Test: Ran cargo_embargo, compared Android.bp Change-Id: I8b02cce89a8c4e231a964f097e7c0c51de1df48e --- Android.bp | 6 ++---- cargo2android.json | 3 --- cargo_embargo.json | 8 ++++++++ 3 files changed, 10 insertions(+), 7 deletions(-) delete mode 100644 cargo2android.json create mode 100644 cargo_embargo.json diff --git a/Android.bp b/Android.bp index c5a14fd..05a67ac 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 { @@ -47,7 +47,5 @@ rust_proc_macro { srcs: ["lib.rs"], edition: "2018", features: ["default"], - rustlibs: [ - "liblitrs", - ], + rustlibs: ["liblitrs"], } diff --git a/cargo2android.json b/cargo2android.json deleted file mode 100644 index 1d33ddd..0000000 --- a/cargo2android.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "run": true -} diff --git a/cargo_embargo.json b/cargo_embargo.json new file mode 100644 index 0000000..0c167f3 --- /dev/null +++ b/cargo_embargo.json @@ -0,0 +1,8 @@ +{ + "package": { + "document-features": { + "device_supported": false + } + }, + "run_cargo": false +} -- cgit v1.2.3