Generate apex_available from c2a instead of a patch am: 9e820487be am: 3138d28955 am: d0d7463c51android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r11android-12.1.0_r10android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12L-devandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-dev

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/ryu/+/1689359

Change-Id: I414e6a3488d42e5a7cd9ad14bb01fb67f60bfaa4

3 files changed, 14 insertions, 17 deletions

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",
-+    ],
- }