From 4e6cf4caec745f60c4d482ba092ae8f39eb7b1ff Mon Sep 17 00:00:00 2001 From: Andrew Walbran Date: Wed, 8 Nov 2023 17:30:47 +0000 Subject: Migrate to cargo_embargo. Bug: 293289578 Test: Ran cargo_embargo, compared Android.bp Change-Id: If8e8ffa618784816ccb96de45516ae71efb1c0cb --- Android.bp | 2 +- cargo2android.json | 10 ---------- cargo_embargo.json | 7 +++++++ 3 files changed, 8 insertions(+), 11 deletions(-) delete mode 100644 cargo2android.json create mode 100644 cargo_embargo.json diff --git a/Android.bp b/Android.bp index 52758cb..ce7239c 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 721cc1a..0000000 --- a/cargo2android.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "apex-available": [ - "//apex_available:platform", - "com.android.virt" - ], - "dependencies": true, - "device": true, - "run": true, - "vendor-available": true -} diff --git a/cargo_embargo.json b/cargo_embargo.json new file mode 100644 index 0000000..fbb9fcd --- /dev/null +++ b/cargo_embargo.json @@ -0,0 +1,7 @@ +{ + "apex_available": [ + "//apex_available:platform", + "com.android.virt" + ], + "run_cargo": false +} -- cgit v1.2.3