Remove patch and use config file. am: 9aa887234fandroid-s-beta-4android-s-beta-3android-s-beta-4

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/smallvec/+/1723362

Change-Id: I8977498edcf234d799e2cb744135b44ded8519fb

3 files changed, 10 insertions, 14 deletions

diff --git a/Android.bp b/Android.bp
index cdf2b8d..7a42765 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --device --run --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.
 
 package {
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 5943f32..0000000
--- a/patches/Android.bp.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Android.bp b/Android.bp
-index e99d7e0..12fdabd 100644
---- a/Android.bp
-+++ b/Android.bp
-@@ -42,4 +42,8 @@ rust_library {
-     crate_name: "smallvec",
-     srcs: ["src/lib.rs"],
-     edition: "2018",
-+    apex_available: [
-+        "//apex_available:platform",
-+        "com.android.virt",
-+    ],
- }