From 661173923dac9b1e909afabafe353c3d6736a9d7 Mon Sep 17 00:00:00 2001 From: Andrew Walbran Date: Fri, 17 Nov 2023 12:26:03 +0000 Subject: Migrate to cargo_embargo. Bug: 293289578 Test: Ran cargo_embargo, compared Android.bp Change-Id: Ic529278da5a9aa2f5743b4e9eaabfa0c3818e63d --- Android.bp | 3 +-- cargo2android.json | 12 ------------ cargo_embargo.json | 13 +++++++++++++ 3 files changed, 14 insertions(+), 14 deletions(-) delete mode 100644 cargo2android.json create mode 100644 cargo_embargo.json diff --git a/Android.bp b/Android.bp index 68c54b6..1ba86d6 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 { @@ -57,7 +57,6 @@ genrule { rust_library { name: "libvulkano", - // has rustc warnings host_supported: true, crate_name: "vulkano", cargo_env_compat: true, diff --git a/cargo2android.json b/cargo2android.json deleted file mode 100644 index 9a5297d..0000000 --- a/cargo2android.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "apex-available": [ - "//apex_available:platform", - "com.android.virt" - ], - "copy-out": true, - "device": true, - "no-presubmit": true, - "run": true, - "tests": false, - "features": "" -} diff --git a/cargo_embargo.json b/cargo_embargo.json new file mode 100644 index 0000000..1f59f23 --- /dev/null +++ b/cargo_embargo.json @@ -0,0 +1,13 @@ +{ + "apex_available": [ + "//apex_available:platform", + "com.android.virt" + ], + "features": [], + "package": { + "vulkano": { + "copy_out": true, + "no_presubmit": true + } + } +} -- cgit v1.2.3