From 43ac7ff6830ad343c3dc7501ccd13de2a0f3a5c7 Mon Sep 17 00:00:00 2001
From: Andrew Walbran <qwandor@google.com>
Date: Fri, 12 May 2023 15:26:11 +0000
Subject: Use new no-std flag to cargo2android.

Bug: 279614907
Test: m pvmfw
Change-Id: Ifd9007c8424b9fa9cb12e7b49bf534af7ac49259
---
 Android.bp             | 49 +++++++++++++++++++++++++++----------------------
 cargo2android.json     | 23 ++++++++++++++---------
 cargo2android_nostd.bp | 18 ------------------
 3 files changed, 41 insertions(+), 49 deletions(-)
 delete mode 100644 cargo2android_nostd.bp

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",
-}
diff --git a/cargo2android.json b/cargo2android.json
index 0be577a..89dc9e6 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -1,15 +1,20 @@
 {
-  "add-toplevel-block": "cargo2android_nostd.bp",
-  "apex-available": [
-    "//apex_available:platform",
-    "com.android.compos",
-    "com.android.resolv",
-    "com.android.virt"
-  ],
   "dependencies": true,
   "device": true,
-  "features": "once,std",
+  "ignore-cargo-errors": true,
   "min-sdk-version": "29",
   "run": true,
-  "tests": true
+  "variants": [
+    {
+      "features": "once,std",
+      "tests": true
+    },
+    {
+      "features": "mutex,spin_mutex",
+      "force-rlib": true,
+      "no-host": true,
+      "suffix": "_nostd",
+      "no-std": true
+    }
+  ]
 }
diff --git a/cargo2android_nostd.bp b/cargo2android_nostd.bp
deleted file mode 100644
index 49d0318..0000000
--- a/cargo2android_nostd.bp
+++ /dev/null
@@ -1,18 +0,0 @@
-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",
-}
-- 
cgit v1.2.3