Remove unneeded patch.

Also switch to using a cargo2android config file while we're at it.

Test: Build
Change-Id: Ib8b1fe6544dc74bfc62731e82eb5f9cf9c1fc533

3 files changed, 14 insertions, 20 deletions

diff --git a/Android.bp b/Android.bp
index fea27bd..2057ce2 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --run --device --dependencies --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.
 
 
@@ -22,11 +22,11 @@ rust_library {
 // dependent_library ["feature_list"]
 //   bitflags-1.2.1 "default"
 //   cfg-if-1.0.0
-//   libc-0.2.94 "default,extra_traits,std"
+//   libc-0.2.95 "default,extra_traits,std"
 //   nix-0.20.0
-//   proc-macro2-1.0.26 "default,proc-macro"
+//   proc-macro2-1.0.27 "default,proc-macro"
 //   quote-1.0.9 "default,proc-macro"
 //   syn-1.0.72 "clone-impls,default,derive,parsing,printing,proc-macro,quote"
-//   thiserror-1.0.24
-//   thiserror-impl-1.0.24
+//   thiserror-1.0.25
+//   thiserror-impl-1.0.25
 //   unicode-xid-0.2.2 "default"
diff --git a/cargo2android.json b/cargo2android.json
new file mode 100644
index 0000000..42b7833
--- /dev/null
+++ b/cargo2android.json
@@ -0,0 +1,9 @@
+{
+  "apex-available": [
+    "//apex_available:platform",
+    "com.android.virt"
+  ],
+  "dependencies": true,
+  "device": true,
+  "run": true
+}
\ No newline at end of file
diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch
deleted file mode 100644
index 94c1fcc..0000000
--- a/patches/Android.bp.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/Android.bp b/Android.bp
-index 0a57129..a6ff574 100644
---- a/Android.bp
-+++ b/Android.bp
-@@ -39,6 +39,10 @@ rust_library {
-         "libnix",
-         "libthiserror",
-     ],
-+    apex_available: [
-+        "//apex_available:platform",
-+        "com.android.virt",
-+    ],
- }
- 
- // dependent_library ["feature_list"]