From caf5fb6a440313f9c31099d42641fd7b22815cd0 Mon Sep 17 00:00:00 2001 From: Andrew Walbran Date: Wed, 18 Oct 2023 18:03:05 +0100 Subject: Migrate to cargo_embargo. Bug: 293289578 Test: Ran cargo_embargo, compared Android.bp Change-Id: Ied86cdf3f9abae59b4e066e60e74ec1f18b5bb4b --- Android.bp | 2 +- cargo2android.json | 9 --------- cargo_embargo.json | 11 +++++++++++ 3 files changed, 12 insertions(+), 10 deletions(-) delete mode 100644 cargo2android.json create mode 100644 cargo_embargo.json diff --git a/Android.bp b/Android.bp index f9f1cbb..cc1dbbb 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 73b74df..0000000 --- a/cargo2android.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "apex-available": [ - "//apex_available:platform", - "com.android.virt" - ], - "device": true, - "features": "alloc,std", - "run": true -} diff --git a/cargo_embargo.json b/cargo_embargo.json new file mode 100644 index 0000000..3740539 --- /dev/null +++ b/cargo_embargo.json @@ -0,0 +1,11 @@ +{ + "features": [ + "alloc", + "std" + ], + "apex_available": [ + "//apex_available:platform", + "com.android.virt" + ], + "run_cargo": false +} -- cgit v1.2.3