From e72d1326c602339ed0e889a386f9f792d8e9c1d7 Mon Sep 17 00:00:00 2001 From: Sergii Parubochyi Date: Wed, 22 Nov 2023 15:20:21 +1100 Subject: Add 'no_std' variant for 'lazy_static'. Need for GBL 'no_std' target. Test: atest Change-Id: I024307633a554e7244afdea035920e4a8e40da1c --- Android.bp | 27 +++++++++++++++++++++++++++ cargo_embargo.json | 23 ++++++++++++++++++++++- 2 files changed, 49 insertions(+), 1 deletion(-) diff --git a/Android.bp b/Android.bp index 169df1c..f78d41a 100644 --- a/Android.bp +++ b/Android.bp @@ -69,3 +69,30 @@ rust_library { vendor_available: true, min_sdk_version: "29", } + +rust_library_rlib { + name: "liblazy_static_nostd", + crate_name: "lazy_static", + cargo_env_compat: true, + cargo_pkg_version: "1.4.0", + srcs: ["src/lib.rs"], + edition: "2015", + features: [ + "spin", + "spin_no_std", + ], + rustlibs: ["libspin_nostd"], + apex_available: [ + "//apex_available:platform", + "//apex_available:anyapex", + ], + prefer_rlib: true, + no_stdlibs: true, + stdlibs: [ + "libcompiler_builtins.rust_sysroot", + "libcore.rust_sysroot", + ], + product_available: true, + vendor_available: true, + min_sdk_version: "29", +} diff --git a/cargo_embargo.json b/cargo_embargo.json index 8902785..e32afad 100644 --- a/cargo_embargo.json +++ b/cargo_embargo.json @@ -10,5 +10,26 @@ ] } }, - "tests": true + "variants": [ + { + "tests": true + }, + { + "features": [ + "spin", + "spin_no_std" + ], + "module_name_overrides": { + "liblazy_static": "liblazy_static_nostd", + "libspin": "libspin_nostd" + }, + "package": { + "lazy_static": { + "force_rlib": true, + "host_supported": false, + "no_std": true + } + } + } + ] } -- cgit v1.2.3