diff --git a/Android.bp b/Android.bp
index cf6d40e..5255673 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --config cargo2android.json.
+// This file is generated by cargo_embargo.
 // Do not modify this file as changes will be overridden on upgrade.
 
 package {
@@ -57,9 +57,7 @@
         "alloc",
         "default",
     ],
-    rustlibs: [
-        "libbitflags",
-    ],
+    rustlibs: ["libbitflags"],
     enabled: false,
     arch: {
         arm64: {
@@ -68,7 +66,7 @@
     },
 }
 
-rust_library {
+rust_library_rlib {
     name: "libaarch64_paging",
     host_supported: true,
     crate_name: "aarch64_paging",
@@ -80,13 +78,18 @@
         "alloc",
         "default",
     ],
-    rustlibs: [
-        "libbitflags",
-    ],
+    rustlibs: ["libbitflags"],
     apex_available: [
         "//apex_available:platform",
         "com.android.virt",
     ],
+    prefer_rlib: true,
+    no_stdlibs: true,
+    stdlibs: [
+        "liballoc.rust_sysroot",
+        "libcompiler_builtins.rust_sysroot",
+        "libcore.rust_sysroot",
+    ],
     product_available: true,
     vendor_available: true,
     enabled: false,
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index 7cf9e83..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "add-module-block": "cargo2android_module.bp",
-  "apex-available": [
-    "//apex_available:platform",
-    "com.android.virt"
-  ],
-  "dependencies": true,
-  "device": true,
-  "run": true,
-  "tests": true
-}
\ No newline at end of file
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..e403355
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,16 @@
+{
+  "tests": true,
+  "apex_available": [
+    "//apex_available:platform",
+    "com.android.virt"
+  ],
+  "package": {
+    "aarch64-paging": {
+      "alloc": true,
+      "no_std": true,
+      "force_rlib": true,
+      "add_module_block": "cargo2android_module.bp"
+    }
+  },
+  "run_cargo": false
+}