From 906d1a2cb902965a46ce54fce220a3d4da74172a Mon Sep 17 00:00:00 2001 From: Andrew Walbran Date: Thu, 16 Nov 2023 15:58:15 +0000 Subject: Migrate to cargo_embargo. Bug: 293289578 Test: Ran cargo_embargo, compared Android.bp Change-Id: I969d8b2128394feddffd1d4d7d12db25f4e2ef13 --- Android.bp | 3 ++- cargo2android.json | 7 ------- cargo_embargo.json | 5 +++++ 3 files changed, 7 insertions(+), 8 deletions(-) delete mode 100644 cargo2android.json create mode 100644 cargo_embargo.json diff --git a/Android.bp b/Android.bp index 1d545f3..b5d0cf5 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 { @@ -25,6 +25,7 @@ rust_library { host_supported: true, crate_name: "static_assertions", cargo_env_compat: true, + cargo_pkg_version: "1.1.0", srcs: ["src/lib.rs"], edition: "2015", apex_available: [ diff --git a/cargo2android.json b/cargo2android.json deleted file mode 100644 index ac5389c..0000000 --- a/cargo2android.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "device": true, - "no_pkg_vers": 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..18570ca --- /dev/null +++ b/cargo_embargo.json @@ -0,0 +1,5 @@ +{ + "min_sdk_version": "29", + "module_blocklist": ["libproc_static_assertions"], + "run_cargo": false +} -- cgit v1.2.3