From b50f98162e8e899894f1d92c8112b7dc4517c10a Mon Sep 17 00:00:00 2001
From: Joel Galenson <jgalenson@google.com>
Date: Tue, 27 Apr 2021 09:00:49 -0700
Subject: Generate apex_available from c2a instead of a patch

Test: Run c2a
Test: Build
Change-Id: Iea23502511cc919bedfc6a341cbf724305480f09
---
 Android.bp               |  3 ++-
 cargo2android.json       |  9 +++++++++
 patches/Android.bp.patch | 13 -------------
 3 files changed, 11 insertions(+), 14 deletions(-)
 create mode 100644 cargo2android.json
 delete mode 100644 patches/Android.bp.patch

diff --git a/Android.bp b/Android.bp
index e572733..e280fde 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,5 @@
-// This file is generated by cargo2android.py --run --dependencies --device --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_bytes_license"],
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 2290fe4..0000000
--- a/patches/Android.bp.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Android.bp b/Android.bp
-index 16c63a4..75d6b62 100644
---- a/Android.bp
-+++ b/Android.bp
-@@ -10,4 +10,8 @@ rust_library {
-         "default",
-         "std",
-     ],
-+    apex_available: [
-+        "//apex_available:platform",
-+        "com.android.virt",
-+    ],
- }
-- 
cgit v1.2.3