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