1 files changed, 14 insertions, 9 deletions
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
+    }
+  ]
 }