From 135ed2e16e4447c0d33b20d502e97a65a86880cd Mon Sep 17 00:00:00 2001 From: Andrew Walbran Date: Mon, 13 Nov 2023 17:16:30 +0000 Subject: Migrate to cargo_embargo. Bug: 293289578 Test: Ran cargo_embargo, compared Android.bp Change-Id: I10b06f1e205fb72432738954522324fbca063b15 --- Android.bp | 8 ++------ cargo2android.json | 4 ---- 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 fc8322b..921c495 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 { name: "libsharded_slab", host_supported: true, @@ -11,9 +9,7 @@ rust_library { cargo_pkg_version: "0.1.4", srcs: ["src/lib.rs"], edition: "2018", - rustlibs: [ - "liblazy_static", - ], + rustlibs: ["liblazy_static"], apex_available: [ "//apex_available:platform", "//apex_available:anyapex", diff --git a/cargo2android.json b/cargo2android.json deleted file mode 100644 index fe43c3f..0000000 --- a/cargo2android.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "run": true, - "device": true -} diff --git a/cargo_embargo.json b/cargo_embargo.json new file mode 100644 index 0000000..cb908d7 --- /dev/null +++ b/cargo_embargo.json @@ -0,0 +1,3 @@ +{ + "run_cargo": false +} -- cgit v1.2.3