From f516a00dd9e34dcd3ef16c652ead66f533f6e809 Mon Sep 17 00:00:00 2001 From: Andrew Walbran Date: Mon, 23 Oct 2023 11:58:34 +0100 Subject: Migrate to cargo_embargo. Bug: 293289578 Test: Run cargo_embargo, compared Android.bp. Change-Id: I4d39856e4a7cd0cc6bf8fb9f5c72fa9d0e081f95 --- Android.bp | 6 ++---- cargo2android.json | 9 --------- cargo_embargo.json | 11 +++++++++++ 3 files changed, 13 insertions(+), 13 deletions(-) delete mode 100644 cargo2android.json create mode 100644 cargo_embargo.json diff --git a/Android.bp b/Android.bp index 81f57ce..f6e84fa 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 { @@ -26,9 +26,7 @@ rust_library { cargo_pkg_version: "0.1.12", srcs: ["src/lib.rs"], edition: "2018", - rustlibs: [ - "libserde", - ], + rustlibs: ["libserde"], apex_available: [ "//apex_available:platform", "com.android.virt", diff --git a/cargo2android.json b/cargo2android.json deleted file mode 100644 index 6e516e0..0000000 --- a/cargo2android.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "apex-available": [ - "//apex_available:platform", - "com.android.virt" - ], - "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..d5ca5d9 --- /dev/null +++ b/cargo_embargo.json @@ -0,0 +1,11 @@ +{ + "tests": true, + "apex_available": [ + "//apex_available:platform", + "com.android.virt" + ], + "module_blocklist": [ + "argh_shared_test_src_lib" + ], + "run_cargo": false +} -- cgit v1.2.3