From 25ae9e30f009003cc397cc618667902f6ac47c1b Mon Sep 17 00:00:00 2001 From: Andrew Walbran Date: Wed, 8 Nov 2023 17:52:04 +0000 Subject: Migrate to cargo_embargo. Bug: 293289578 Test: Ran cargo_embargo, compared Android.bp Change-Id: I1e4abaf7c8e30e9562110233a546735c4f561f0d --- Android.bp | 7 ++----- cargo2android.json | 5 ----- 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 c528e9f..cb2063b 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 { @@ -39,16 +39,13 @@ license { rust_library { name: "libfxhash", - // has rustc warnings host_supported: true, crate_name: "fxhash", cargo_env_compat: true, cargo_pkg_version: "0.2.1", srcs: ["lib.rs"], edition: "2015", - rustlibs: [ - "libbyteorder", - ], + rustlibs: ["libbyteorder"], apex_available: [ "//apex_available:platform", "//apex_available:anyapex", diff --git a/cargo2android.json b/cargo2android.json deleted file mode 100644 index 31338da..0000000 --- a/cargo2android.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "run": true, - "device": true, - "dependencies": 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