diff --git a/Android.bp b/Android.bp
index 6ad858e..4a33246 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,5 @@
-// This file is generated by cargo2android.py --device --run --dependencies --tests --patch=patches/Android.bp.patch.
+// This file is generated by cargo2android.py --config cargo2android.json.
+// Do not modify this file as changes will be overridden on upgrade.
 
 package {
     default_applicable_licenses: ["external_rust_crates_num-traits_license"],
@@ -46,14 +47,14 @@
         "default",
         "std",
     ],
+    cfgs: [
+        "has_i128",
+        "has_to_int_unchecked",
+    ],
     apex_available: [
         "//apex_available:platform",
         "com.android.virt",
     ],
-    flags: [
-        "--cfg has_i128",
-        "--cfg has_to_int_unchecked",
-    ],
 }
 
 rust_defaults {
@@ -67,15 +68,18 @@
         "default",
         "std",
     ],
-    flags: [
-        "--cfg has_i128",
-        "--cfg has_to_int_unchecked",
+    cfgs: [
+        "has_i128",
+        "has_to_int_unchecked",
     ],
 }
 
 rust_test_host {
     name: "num-traits_host_test_src_lib",
     defaults: ["num-traits_defaults"],
+    test_options: {
+        unit_test: true,
+    },
 }
 
 rust_test {
@@ -94,9 +98,9 @@
         "default",
         "std",
     ],
-    flags: [
-        "--cfg has_i128",
-        "--cfg has_to_int_unchecked",
+    cfgs: [
+        "has_i128",
+        "has_to_int_unchecked",
     ],
     rustlibs: [
         "libnum_traits",
@@ -106,6 +110,9 @@
 rust_test_host {
     name: "num-traits_host_test_tests_cast",
     defaults: ["num-traits_defaults_cast"],
+    test_options: {
+        unit_test: true,
+    },
 }
 
 rust_test {
diff --git a/cargo2android.json b/cargo2android.json
new file mode 100644
index 0000000..ac56e26
--- /dev/null
+++ b/cargo2android.json
@@ -0,0 +1,10 @@
+{
+  "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/patches/Android.bp.patch b/patches/Android.bp.patch
deleted file mode 100644
index b61b82c..0000000
--- a/patches/Android.bp.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/Android.bp b/Android.bp
-index 5abab3c..b920d56 100644
---- a/Android.bp
-+++ b/Android.bp
-@@ -46,6 +46,10 @@ rust_library {
-         "default",
-         "std",
-     ],
-+    apex_available: [
-+        "//apex_available:platform",
-+        "com.android.virt",
-+    ],
-     flags: [
-         "--cfg has_i128",
-         "--cfg has_to_int_unchecked",