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

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

diff --git a/Android.bp b/Android.bp
index 1aa4ba0..d32ed19 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,5 @@
-// This file is generated by cargo2android.py --run --device --dependencies.
+// 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_ryu_license"],
@@ -44,9 +45,9 @@ rust_library {
     crate_name: "ryu",
     srcs: ["src/lib.rs"],
     edition: "2018",
-    flags: [
-        "--cfg integer128",
-        "--cfg maybe_uninit",
+    cfgs: [
+        "integer128",
+        "maybe_uninit",
     ],
     apex_available: [
         "//apex_available:platform",
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 343b704..0000000
--- a/patches/Android.bp.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Android.bp b/Android.bp
-index bbb0114..e47c45a 100644
---- a/Android.bp
-+++ b/Android.bp
-@@ -10,4 +10,8 @@ rust_library {
-         "--cfg integer128",
-         "--cfg maybe_uninit",
-     ],
-+    apex_available: [
-+        "//apex_available:platform",
-+        "com.android.virt",
-+    ],
- }
-- 
cgit v1.2.3