From b8374cfeae905a4fa97421a3cfa4957b3495c9de Mon Sep 17 00:00:00 2001 From: Andrew Walbran Date: Wed, 8 Nov 2023 17:54:43 +0000 Subject: Migrate to cargo_embargo. Bug: 293289578 Test: Ran cargo_embargo, compared Android.bp Change-Id: I6cd8750bf11630a6db7406936486f3557e47c4da --- Android.bp | 2 +- cargo2android.json | 10 ---------- cargo_embargo.json | 8 ++++++++ 3 files changed, 9 insertions(+), 11 deletions(-) delete mode 100644 cargo2android.json create mode 100644 cargo_embargo.json diff --git a/Android.bp b/Android.bp index c80099f..4ffc58f 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 f9f13d4..0000000 --- a/cargo2android.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "apex-available": [ - "//apex_available:platform", - "com.android.resolv" - ], - "dependencies": true, - "device": true, - "min-sdk-version": "29", - "run": true -} \ No newline at end of file diff --git a/cargo_embargo.json b/cargo_embargo.json new file mode 100644 index 0000000..9617c46 --- /dev/null +++ b/cargo_embargo.json @@ -0,0 +1,8 @@ +{ + "apex_available": [ + "//apex_available:platform", + "com.android.resolv" + ], + "min_sdk_version": "29", + "run_cargo": false +} -- cgit v1.2.3