From 84153911d3a16efb513a8760b59f8956d6e5cd2a Mon Sep 17 00:00:00 2001
From: Joel Galenson <jgalenson@google.com>
Date: Wed, 28 Apr 2021 09:19:58 -0700
Subject: Generate apex_available from c2a instead of a patch

Test: Run c2a
Test: Build
Change-Id: I0f47f84338c76a3a5c4b3883ab7d7ea66f87846f
---
 Android.bp               |  6 +++---
 cargo2android.json       |  9 +++++++++
 patches/Android.bp.patch | 15 ---------------
 3 files changed, 12 insertions(+), 18 deletions(-)
 create mode 100644 cargo2android.json
 delete mode 100644 patches/Android.bp.patch

diff --git a/Android.bp b/Android.bp
index a735df9..b0525ae 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// 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 {
@@ -51,8 +51,8 @@ rust_library {
 }
 
 // dependent_library ["feature_list"]
-//   proc-macro2-1.0.24 "default,proc-macro"
+//   proc-macro2-1.0.26 "default,proc-macro"
 //   quote-1.0.9 "default,proc-macro"
-//   syn-1.0.60 "clone-impls,default,derive,parsing,printing,proc-macro,quote"
+//   syn-1.0.71 "clone-impls,default,derive,parsing,printing,proc-macro,quote"
 //   thiserror-impl-1.0.24
 //   unicode-xid-0.2.1 "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 fb3085f..0000000
--- a/patches/Android.bp.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/Android.bp b/Android.bp
-index 064fc31..985b472 100644
---- a/Android.bp
-+++ b/Android.bp
-@@ -7,6 +7,10 @@ rust_library {
-     srcs: ["src/lib.rs"],
-     edition: "2018",
-     proc_macros: ["libthiserror_impl"],
-+    apex_available: [
-+        "//apex_available:platform",
-+        "com.android.virt",
-+    ],
- }
- 
- // dependent_library ["feature_list"]
-- 
cgit v1.2.3