From ce649db3091dbeb99c0fd685dc6ef953e5a04d42 Mon Sep 17 00:00:00 2001 From: Andrew Walbran Date: Mon, 13 Nov 2023 17:17:09 +0000 Subject: Migrate to cargo_embargo. Bug: 293289578 Test: Ran cargo_embargo, compared Android.bp Change-Id: I90e23c1a3c68bcb9d400e3710ed6364dcb72ed39 --- Android.bp | 2 +- cargo2android.json | 12 ------------ cargo_embargo.json | 10 ++++++++++ 3 files changed, 11 insertions(+), 13 deletions(-) delete mode 100644 cargo2android.json create mode 100644 cargo_embargo.json diff --git a/Android.bp b/Android.bp index a64911f..4211203 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 7b27fc0..0000000 --- a/cargo2android.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "apex-available": [ - "//apex_available:platform", - "com.android.btservices", - "com.android.resolv", - "com.android.virt" - ], - "dependencies": true, - "device": true, - "min-sdk-version": "29", - "run": true -} diff --git a/cargo_embargo.json b/cargo_embargo.json new file mode 100644 index 0000000..76e999c --- /dev/null +++ b/cargo_embargo.json @@ -0,0 +1,10 @@ +{ + "apex_available": [ + "//apex_available:platform", + "com.android.btservices", + "com.android.resolv", + "com.android.virt" + ], + "min_sdk_version": "29", + "run_cargo": false +} -- cgit v1.2.3