1 files changed, 27 insertions, 22 deletions
diff --git a/Android.bp b/Android.bp
index e2e6eb4..63d8ab4 100644
--- a/Android.bp
+++ b/Android.bp
@@ -45,9 +45,33 @@ rust_library {
     ],
     apex_available: [
         "//apex_available:platform",
-        "com.android.compos",
-        "com.android.resolv",
-        "com.android.virt",
+        "//apex_available:anyapex",
+    ],
+    product_available: true,
+    vendor_available: true,
+    min_sdk_version: "29",
+}
+
+rust_library_rlib {
+    name: "libspin_nostd",
+    crate_name: "spin",
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.9.7",
+    srcs: ["src/lib.rs"],
+    edition: "2015",
+    features: [
+        "mutex",
+        "spin_mutex",
+    ],
+    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,
@@ -75,22 +99,3 @@ rust_test {
         "libcriterion",
     ],
 }
-
-rust_library_rlib {
-    name: "libspin_nostd",
-    host_supported: true,
-    crate_name: "spin",
-    cargo_env_compat: true,
-    cargo_pkg_version: "0.9.2",
-    srcs: ["src/lib.rs"],
-    edition: "2015",
-    features: [
-        "mutex",
-        "spin_mutex",
-    ],
-    apex_available: [
-        "//apex_available:platform",
-        "com.android.virt",
-    ],
-    min_sdk_version: "29",
-}