Snap for 11139387 from 8cb60c64f93d2a3f480bfc02592f359476054894 to 24Q1-releaseandroid-14.0.0_r37android-14.0.0_r36android-14.0.0_r35android-14.0.0_r34android-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android14-qpr2-s5-releaseandroid14-qpr2-s4-releaseandroid14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-release

Change-Id: I6ae857694d5618e68b791d2c912e54cda271cc61

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
+        }
+      }
+    }
+  ]
 }