From cbb2c115f9b88fdb117a9afdd3a46341783f9a86 Mon Sep 17 00:00:00 2001 From: Andrew Walbran Date: Mon, 13 Nov 2023 17:20:13 +0000 Subject: Migrate to cargo_embargo. Bug: 293289578 Test: Ran cargo_embargo, compared Android.bp Change-Id: I83b0727e1b8953585b7ad393512ec98db1d74903 --- Android.bp | 2 +- cargo2android.json | 10 ---------- cargo_embargo.json | 14 ++++++++++++++ 3 files changed, 15 insertions(+), 11 deletions(-) delete mode 100644 cargo2android.json create mode 100644 cargo_embargo.json diff --git a/Android.bp b/Android.bp index d80fdf7..357bd1c 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 aae1f59..0000000 --- a/cargo2android.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "apex-available": [ - "//apex_available:platform", - "com.android.btservices" - ], - "device": true, - "features": "time,net,io-util,fs", - "min-sdk-version": "29", - "run": true -} diff --git a/cargo_embargo.json b/cargo_embargo.json new file mode 100644 index 0000000..2fff605 --- /dev/null +++ b/cargo_embargo.json @@ -0,0 +1,14 @@ +{ + "apex_available": [ + "//apex_available:platform", + "com.android.btservices" + ], + "features": [ + "time", + "net", + "io-util", + "fs" + ], + "min_sdk_version": "29", + "run_cargo": false +} -- cgit v1.2.3