Generate apex_available from c2a instead of a patch am: fd4214399a am: 8ef9e0875e am: a12ae846d2 am: dd52553c1f

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

Change-Id: I72727fa0f4ba907d9de41e2e9934e795c52d3a47

Android.bp

diff --git a/Android.bp b/Android.bp
index 012442c..babd7e3 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --run --dependencies --device --features=bytes --copy-out --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 {

cargo2android.json

diff --git a/cargo2android.json b/cargo2android.json
new file mode 100644
index 0000000..85afab5
--- /dev/null
+++ b/cargo2android.json
@@ -0,0 +1,11 @@
+{
+  "apex-available": [
+    "//apex_available:platform",
+    "com.android.virt"
+  ],
+  "copy-out": true,
+  "dependencies": true,
+  "device": true,
+  "features": "bytes",
+  "run": true
+}
\ No newline at end of file

patches/Android.bp.patch

diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch
deleted file mode 100644
index 2420ac3..0000000
--- a/patches/Android.bp.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/Android.bp b/Android.bp
-index f99592b..44b6b8e 100644
---- a/Android.bp
-+++ b/Android.bp
-@@ -20,6 +20,10 @@ rust_library {
-     rustlibs: [
-         "libbytes",
-     ],
-+    apex_available: [
-+        "//apex_available:platform",
-+        "com.android.virt",
-+    ],
- }
- 
- // dependent_library ["feature_list"]