From 3742ab94f0761250d2e58f42e1d01f0d40b52dbf Mon Sep 17 00:00:00 2001 From: Andrew Walbran Date: Wed, 8 Nov 2023 17:57:55 +0000 Subject: Migrate to cargo_embargo. Bug: 293289578 Test: Ran cargo_embargo, compared Android.bp Change-Id: I0511abc88542395e366f79d41e274ef32917f309 --- Android.bp | 3 +-- cargo2android.json | 5 ----- cargo_embargo.json | 4 ++++ 3 files changed, 5 insertions(+), 7 deletions(-) delete mode 100644 cargo2android.json create mode 100644 cargo_embargo.json diff --git a/Android.bp b/Android.bp index 22790af..155eace 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 { @@ -20,7 +20,6 @@ license { rust_library { name: "libwhich", - // has rustc warnings host_supported: true, crate_name: "which", cargo_env_compat: true, diff --git a/cargo2android.json b/cargo2android.json deleted file mode 100644 index 5fd6c55..0000000 --- a/cargo2android.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "device": true, - "features": "", - "run": true -} \ No newline at end of file diff --git a/cargo_embargo.json b/cargo_embargo.json new file mode 100644 index 0000000..b639cc5 --- /dev/null +++ b/cargo_embargo.json @@ -0,0 +1,4 @@ +{ + "features": [], + "run_cargo": false +} -- cgit v1.2.3