From 32f8d5ddc4df5d8eab2c84aa9d22945f3f55eef2 Mon Sep 17 00:00:00 2001 From: Andrew Walbran Date: Tue, 21 Nov 2023 16:48:19 +0000 Subject: Migrate to cargo_embargo. Bug: 293289578 Test: Ran cargo_embargo, compared Android.bp Change-Id: Ib9eeba077f65b54b24cc95785f7b671d1de5f843 --- Android.bp | 2 +- cargo2android.json | 6 ------ cargo_embargo.json | 15 +++++++++++++++ 3 files changed, 16 insertions(+), 7 deletions(-) delete mode 100644 cargo2android.json create mode 100644 cargo_embargo.json diff --git a/Android.bp b/Android.bp index 5f11192..7f39cbb 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 { diff --git a/cargo2android.json b/cargo2android.json deleted file mode 100644 index ea1fdc2..0000000 --- a/cargo2android.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "copy-out": true, - "features": "__cli,experimental,runtime,which-rustfmt", - "host-first-multilib": true, - "run": true -} diff --git a/cargo_embargo.json b/cargo_embargo.json new file mode 100644 index 0000000..3ffb84d --- /dev/null +++ b/cargo_embargo.json @@ -0,0 +1,15 @@ +{ + "features": [ + "__cli", + "experimental", + "runtime", + "which-rustfmt" + ], + "package": { + "bindgen": { + "copy_out": true, + "device_supported": false, + "host_first_multilib": true + } + } +} -- cgit v1.2.3