From 2d80cc121234b8ca6436f52c6d4d88bfcc9ad9e8 Mon Sep 17 00:00:00 2001 From: Andrew Walbran Date: Tue, 14 Nov 2023 15:57:27 +0000 Subject: Migrate to cargo_embargo. Bug: 293289578 Test: Ran cargo_embargo, compared Android.bp Change-Id: I8cc2991c13df74d2d3f8699bb966273ae409d3ae --- Android.bp | 2 +- cargo2android.json | 15 --------------- cargo_embargo.json | 11 +++++++++++ 3 files changed, 12 insertions(+), 16 deletions(-) delete mode 100644 cargo2android.json create mode 100644 cargo_embargo.json diff --git a/Android.bp b/Android.bp index 3e97f84..75da8a9 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 f692b87..0000000 --- a/cargo2android.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "apex-available": [ - "//apex_available:platform", - "com.android.btservices", - "com.android.compos", - "com.android.resolv", - "com.android.uwb", - "com.android.virt" - ], - "dependencies": true, - "device": true, - "min-sdk-version": "29", - "vendor-available": true, - "run": true -} diff --git a/cargo_embargo.json b/cargo_embargo.json new file mode 100644 index 0000000..10900a4 --- /dev/null +++ b/cargo_embargo.json @@ -0,0 +1,11 @@ +{ + "apex_available": [ + "//apex_available:platform", + "com.android.btservices", + "com.android.compos", + "com.android.resolv", + "com.android.uwb", + "com.android.virt" + ], + "min_sdk_version": "29" +} -- cgit v1.2.3