From 1e28b5203368103a02d575bdda5d335551b651c8 Mon Sep 17 00:00:00 2001 From: Andrew Walbran Date: Fri, 10 Nov 2023 16:19:38 +0000 Subject: Migrate to cargo_embargo. Bug: 293289578 Test: Ran cargo_embargo, compared Android.bp Change-Id: Iffb3286079aba1e2ebdcf00e5f83edb747076c4d --- Android.bp | 6 ++---- cargo2android.json | 6 ------ cargo_embargo.json | 3 +++ 3 files changed, 5 insertions(+), 10 deletions(-) delete mode 100644 cargo2android.json create mode 100644 cargo_embargo.json diff --git a/Android.bp b/Android.bp index 48335d3..4e73ba7 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 { @@ -45,9 +45,7 @@ rust_library { cargo_pkg_version: "0.3.2", srcs: ["src/lib.rs"], edition: "2021", - rustlibs: [ - "libos_str_bytes", - ], + rustlibs: ["libos_str_bytes"], apex_available: [ "//apex_available:platform", "//apex_available:anyapex", diff --git a/cargo2android.json b/cargo2android.json deleted file mode 100644 index 3ebdf72..0000000 --- a/cargo2android.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "dependencies": true, - "device": true, - "run": true, - "tests": true -} diff --git a/cargo_embargo.json b/cargo_embargo.json new file mode 100644 index 0000000..9a0a579 --- /dev/null +++ b/cargo_embargo.json @@ -0,0 +1,3 @@ +{ + "tests": true +} -- cgit v1.2.3