From 230dba8205e6f65e401786f4082a7e55b11cc8ee Mon Sep 17 00:00:00 2001 From: Andrew Walbran Date: Tue, 14 Nov 2023 18:36:55 +0000 Subject: Migrate to cargo_embargo. Bug: 293289578 Test: Ran cargo_embargo, compared Android.bp Change-Id: Ie7fa1218bf11aacbe26b30f545b367671084520c --- Android.bp | 3 +-- cargo2android.json | 4 ---- cargo_embargo.json | 8 ++++++++ 3 files changed, 9 insertions(+), 6 deletions(-) delete mode 100644 cargo2android.json create mode 100644 cargo_embargo.json diff --git a/Android.bp b/Android.bp index 6b63814..4715ffb 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 { @@ -41,7 +41,6 @@ license { rust_library_host { name: "libproc_macro_error", - // has rustc warnings crate_name: "proc_macro_error", cargo_env_compat: true, cargo_pkg_version: "1.0.4", diff --git a/cargo2android.json b/cargo2android.json deleted file mode 100644 index bb77633..0000000 --- a/cargo2android.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "host-first-multilib": true, - "run": true -} \ No newline at end of file diff --git a/cargo_embargo.json b/cargo_embargo.json new file mode 100644 index 0000000..887288a --- /dev/null +++ b/cargo_embargo.json @@ -0,0 +1,8 @@ +{ + "package": { + "proc-macro-error": { + "device_supported": false, + "host_first_multilib": true + } + } +} -- cgit v1.2.3