From ff267a7f5f74a306daa4e9eb750dfea6f9d577a9 Mon Sep 17 00:00:00 2001 From: Andrew Walbran Date: Thu, 9 Nov 2023 14:03:46 +0000 Subject: Migrate to cargo_embargo. Bug: 293289578 Test: Ran cargo_embargo, compared Android.bp Change-Id: I20d79ec5c10ece84650a39167fead5cea9980f56 --- Android.bp | 2 +- cargo2android.json | 12 ------------ cargo_embargo.json | 8 ++++++++ 3 files changed, 9 insertions(+), 13 deletions(-) delete mode 100644 cargo2android.json create mode 100644 cargo_embargo.json diff --git a/Android.bp b/Android.bp index b09a46d..2a725db 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 c6170fd..0000000 --- a/cargo2android.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "apex-available": [ - "//apex_available:anyapex", - "//apex_available:platform" - ], - "dependencies": true, - "device": true, - "run": true, - "tests": true, - "product-available": true, - "vendor-available": true -} diff --git a/cargo_embargo.json b/cargo_embargo.json new file mode 100644 index 0000000..5b612a5 --- /dev/null +++ b/cargo_embargo.json @@ -0,0 +1,8 @@ +{ + "apex_available": [ + "//apex_available:anyapex", + "//apex_available:platform" + ], + "run_cargo": false, + "tests": true +} -- cgit v1.2.3