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

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

diff --git a/Android.bp b/Android.bp
index d074f9c..8e9044a 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: [
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 177e109..0000000
--- a/patches/Android.bp.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/Android.bp b/Android.bp
-index 7dad1bf..ccb680f 100644
---- a/Android.bp
-+++ b/Android.bp
-@@ -10,6 +10,11 @@ rust_library {
-         "libmatches",
-         "libpercent_encoding",
-     ],
-+    apex_available: [
-+        "//apex_available:platform",
-+        "com.android.resolv",
-+    ],
-+    min_sdk_version: "29",
- }
- 
- // dependent_library ["feature_list"]
-- 
cgit v1.2.3