From a4e9ae9e34337931c4b5636eb274707e66dff33b Mon Sep 17 00:00:00 2001 From: Andrew Walbran Date: Mon, 20 Nov 2023 13:14:31 +0000 Subject: Migrate to cargo_embargo. Bug: 293289578 Test: Ran cargo_embargo, compared Android.bp Change-Id: Iad6f3fd54da05fc1dc30d7a290640c14e8c52c5d --- Android.bp | 2 +- cargo2android.json | 9 --------- cargo_embargo.json | 10 ++++++++++ 3 files changed, 11 insertions(+), 10 deletions(-) delete mode 100644 cargo2android.json create mode 100644 cargo_embargo.json diff --git a/Android.bp b/Android.bp index 9e9f09a..17434a8 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 f57bdc2..0000000 --- a/cargo2android.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "dependencies": true, - "device": true, - "features": "net,os-ext,os-poll", - "min-sdk-version": "29", - "run": true, - "vendor-available": true, - "tests": true -} diff --git a/cargo_embargo.json b/cargo_embargo.json new file mode 100644 index 0000000..203f7fc --- /dev/null +++ b/cargo_embargo.json @@ -0,0 +1,10 @@ +{ + "features": [ + "net", + "os-ext", + "os-poll" + ], + "min_sdk_version": "29", + "run_cargo": false, + "tests": true +} -- cgit v1.2.3