Snap for 11400057 from 62f4c942d235c727196b698e520ae473f4260db5 to simpleperf-releasesimpleperf-release

Change-Id: I21622b49cd12d09a0a43fcee78a47038ef601e0d

3 files changed, 63 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
+        }
+      }
+    }
+  ]
 }
diff --git a/rules.mk b/rules.mk
new file mode 100644
index 0000000..7bcbbab
--- /dev/null
+++ b/rules.mk
@@ -0,0 +1,14 @@
+# This file is generated by cargo2rulesmk.py --run.
+# Do not modify this file as changes will be overridden on upgrade.
+
+LOCAL_DIR := $(GET_LOCAL_DIR)
+MODULE := $(LOCAL_DIR)
+MODULE_CRATE_NAME := lazy_static
+MODULE_SRCS := \
+	$(LOCAL_DIR)/src/lib.rs \
+
+MODULE_RUST_EDITION := 2015
+MODULE_LIBRARY_DEPS := \
+	external/rust/crates/spin \
+
+include make/library.mk