From c645706ff62f2333b238e57112331d92f2f758e8 Mon Sep 17 00:00:00 2001 From: Andrew Walbran Date: Mon, 13 Nov 2023 17:18:47 +0000 Subject: Migrate to cargo_embargo. Bug: 293289578 Test: Ran cargo_embargo, compared Android.bp Change-Id: I7b715c3ec98c8127bf2966979fb54676e2ea2818 --- Android.bp | 2 +- cargo2android.json | 11 ----------- cargo_embargo.json | 9 +++++++++ 3 files changed, 10 insertions(+), 12 deletions(-) delete mode 100644 cargo2android.json create mode 100644 cargo_embargo.json diff --git a/Android.bp b/Android.bp index 0eebfaa..7555b0b 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 a78ac00..0000000 --- a/cargo2android.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "apex-available": [ - "//apex_available:platform", - "com.android.compos", - "com.android.virt" - ], - "dependencies": true, - "device": true, - "features": "", - "run": true -} \ No newline at end of file diff --git a/cargo_embargo.json b/cargo_embargo.json new file mode 100644 index 0000000..5a3fcaa --- /dev/null +++ b/cargo_embargo.json @@ -0,0 +1,9 @@ +{ + "apex_available": [ + "//apex_available:platform", + "com.android.compos", + "com.android.virt" + ], + "features": [], + "run_cargo": false +} -- cgit v1.2.3