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

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

diff --git a/Android.bp b/Android.bp
index 89e18da..02e5f65 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,5 @@
-// This file is generated by cargo2android.py --run --device --dependencies --tests --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_url_license"],
@@ -135,14 +136,14 @@ rust_test {
 // dependent_library ["feature_list"]
 //   bencher-0.1.5
 //   form_urlencoded-1.0.1
-//   idna-0.2.2
+//   idna-0.2.3
 //   itoa-0.4.7
 //   matches-0.1.8
 //   percent-encoding-2.1.0
 //   ryu-1.0.5
-//   serde-1.0.123 "std"
-//   serde_json-1.0.62 "default,std"
-//   tinyvec-1.1.1 "alloc,default,tinyvec_macros"
+//   serde-1.0.125 "std"
+//   serde_json-1.0.64 "default,std"
+//   tinyvec-1.2.0 "alloc,default,tinyvec_macros"
 //   tinyvec_macros-0.1.0
-//   unicode-bidi-0.3.4 "default"
+//   unicode-bidi-0.3.5 "default"
 //   unicode-normalization-0.1.17 "default,std"
diff --git a/cargo2android.json b/cargo2android.json
new file mode 100644
index 0000000..911c36f
--- /dev/null
+++ b/cargo2android.json
@@ -0,0 +1,11 @@
+{
+  "apex-available": [
+    "//apex_available:platform",
+    "com.android.resolv"
+  ],
+  "dependencies": true,
+  "device": true,
+  "min-sdk-version": "29",
+  "run": true,
+  "tests": true
+}
\ No newline at end of file
diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch
deleted file mode 100644
index 3b90dc3..0000000
--- a/patches/Android.bp.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/Android.bp b/Android.bp
-index f3305e8..75e8805 100644
---- a/Android.bp
-+++ b/Android.bp
-@@ -12,6 +12,11 @@ rust_library {
-         "libmatches",
-         "libpercent_encoding",
-     ],
-+    apex_available: [
-+        "//apex_available:platform",
-+        "com.android.resolv",
-+    ],
-+    min_sdk_version: "29",
- }
- 
- rust_defaults {
-- 
cgit v1.2.3