From 5b6cea4867d422d8e29b31a5acbb29cac7a422cf Mon Sep 17 00:00:00 2001
From: Andrew Walbran <qwandor@google.com>
Date: Fri, 12 May 2023 13:39:07 +0000
Subject: Use new no-std flag to cargo2android.

Bug: 279614907
Test: Ran cargo2android and compared Android.bp
Change-Id: I20d3de8045843e230452973e6234dfb9609adbc9
---
 Android.bp             | 49 +++++++++++++++++++++++++------------------------
 cargo2android.json     | 21 +++++++++++++--------
 cargo2android_nostd.bp | 20 --------------------
 3 files changed, 38 insertions(+), 52 deletions(-)
 delete mode 100644 cargo2android_nostd.bp

diff --git a/Android.bp b/Android.bp
index 1f468e4..157f1ab 100644
--- a/Android.bp
+++ b/Android.bp
@@ -46,8 +46,31 @@ rust_library {
     proc_macros: ["libzeroize_derive"],
     apex_available: [
         "//apex_available:platform",
-        "com.android.uwb",
-        "com.android.virt",
+        "//apex_available:anyapex",
+    ],
+    product_available: true,
+    vendor_available: true,
+    min_sdk_version: "Tiramisu",
+}
+
+rust_library_rlib {
+    name: "libzeroize_nostd",
+    crate_name: "zeroize",
+    cargo_env_compat: true,
+    cargo_pkg_version: "1.6.0",
+    srcs: ["src/lib.rs"],
+    edition: "2021",
+    features: ["zeroize_derive"],
+    proc_macros: ["libzeroize_derive"],
+    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,
@@ -91,25 +114,3 @@ rust_test {
         unit_test: true,
     },
 }
-
-rust_library_rlib {
-    name: "libzeroize_nostd",
-    crate_name: "zeroize",
-    cargo_env_compat: true,
-    cargo_pkg_version: "1.5.7",
-    srcs: ["src/lib.rs"],
-    edition: "2018",
-    proc_macros: ["libzeroize_derive"],
-    prefer_rlib: true,
-    no_stdlibs: true,
-    stdlibs: [
-        "libcompiler_builtins.rust_sysroot",
-        "libcore.rust_sysroot",
-    ],
-    features: [
-        "zeroize_derive",
-    ],
-    vendor_available: true,
-    min_sdk_version: "Tiramisu",
-}
-
diff --git a/cargo2android.json b/cargo2android.json
index d05dd9f..b6a9107 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -1,14 +1,19 @@
 {
-  "add-toplevel-block": "cargo2android_nostd.bp",
-  "apex-available": [
-    "//apex_available:platform",
-    "com.android.uwb",
-    "com.android.virt"
-  ],
   "device": true,
   "run": true,
   "min_sdk_version": "Tiramisu",
   "vendor-available": true,
-  "tests": true,
-  "features": "alloc,zeroize_derive"
+  "variants": [
+    {
+      "features": "alloc,zeroize_derive",
+      "tests": true
+    },
+    {
+      "features": "zeroize_derive",
+      "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 d7f5eb2..0000000
--- a/cargo2android_nostd.bp
+++ /dev/null
@@ -1,20 +0,0 @@
-rust_library_rlib {
-    name: "libzeroize_nostd",
-    crate_name: "zeroize",
-    cargo_env_compat: true,
-    cargo_pkg_version: "1.5.7",
-    srcs: ["src/lib.rs"],
-    edition: "2018",
-    proc_macros: ["libzeroize_derive"],
-    prefer_rlib: true,
-    no_stdlibs: true,
-    stdlibs: [
-        "libcompiler_builtins.rust_sysroot",
-        "libcore.rust_sysroot",
-    ],
-    features: [
-        "zeroize_derive",
-    ],
-    vendor_available: true,
-    min_sdk_version: "Tiramisu",
-}
-- 
cgit v1.2.3