aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergii Parubochyi <sergiip@google.com>2023-11-22 23:17:03 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-22 23:17:03 +0000
commit60ca529149fd593b1b80d35dd345f14edea67017 (patch)
treef54867e657572ec2467ad84e4cf9c73826ccb70b
parent2acdb74175309eabd7c1511eb06ef4f85300d06e (diff)
parente72d1326c602339ed0e889a386f9f792d8e9c1d7 (diff)
downloadlazy_static-60ca529149fd593b1b80d35dd345f14edea67017.tar.gz
Add 'no_std' variant for 'lazy_static'. am: e72d1326c6
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/lazy_static/+/2842794 Change-Id: Idb377b07f069fea2e49f5de77b8c85ab8c7fe8e6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp27
-rw-r--r--cargo_embargo.json23
2 files changed, 49 insertions, 1 deletions
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
+ }
+ }
+ }
+ ]
}