From 7c80a348c101949da9cbf3e823bc2f63b6b1ebc8 Mon Sep 17 00:00:00 2001 From: Andrew Walbran Date: Wed, 8 Nov 2023 17:43:40 +0000 Subject: Migrate to cargo_embargo. Bug: 293289578 Test: Ran cargo_embargo, compared Android.bp Change-Id: I9cb2bc748d3430739d814a40d7573113ce0f3bef --- Android.bp | 2 +- cargo2android.json | 11 ----------- cargo_embargo.json | 13 +++++++++++++ 3 files changed, 14 insertions(+), 12 deletions(-) delete mode 100644 cargo2android.json create mode 100644 cargo_embargo.json diff --git a/Android.bp b/Android.bp index 6465378..709a55f 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 94e72b7..0000000 --- a/cargo2android.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "apex-available": [ - "//apex_available:platform", - "com.android.compos", - "com.android.virt" - ], - "device": true, - "force-rlib": true, - "run": true, - "vendor-available": true -} diff --git a/cargo_embargo.json b/cargo_embargo.json new file mode 100644 index 0000000..4747e56 --- /dev/null +++ b/cargo_embargo.json @@ -0,0 +1,13 @@ +{ + "apex_available": [ + "//apex_available:platform", + "com.android.compos", + "com.android.virt" + ], + "package": { + "foreign-types-shared": { + "force_rlib": true + } + }, + "run_cargo": false +} -- cgit v1.2.3