Generate apex_available from c2a instead of a patch am: a907edecf9 am: cbe61bd42e am: 910869d321 am: 0204cb5c5dandroid-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-release

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

Change-Id: Icbf3ea74be8eec725f0b003e8a3fea22d1bcc7dd

3 files changed, 14 insertions, 10 deletions

diff --git a/Android.bp b/Android.bp
index 6916e0b..2284c8e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --run --device --dependencies --features=default,derive --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 {
@@ -78,5 +78,5 @@ rust_library {
 //   proc-macro2-1.0.26 "default,proc-macro"
 //   quote-1.0.9 "default,proc-macro"
 //   serde_derive-1.0.125 "default"
-//   syn-1.0.69 "clone-impls,default,derive,parsing,printing,proc-macro,quote"
+//   syn-1.0.71 "clone-impls,default,derive,parsing,printing,proc-macro,quote"
 //   unicode-xid-0.2.1 "default"
diff --git a/cargo2android.json b/cargo2android.json
new file mode 100644
index 0000000..4e40fcb
--- /dev/null
+++ b/cargo2android.json
@@ -0,0 +1,11 @@
+{
+  "apex-available": [
+    "//apex_available:platform",
+    "com.android.virt"
+  ],
+  "dependencies": true,
+  "device": true,
+  "features": "default,derive",
+  "patch": "patches/Android.bp.patch",
+  "run": true
+}
\ No newline at end of file
diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch
index c124dc0..071947f 100644
--- a/patches/Android.bp.patch
+++ b/patches/Android.bp.patch
@@ -2,7 +2,7 @@ diff --git b/Android.bp a/Android.bp
 index 41d67cc..277296f 100644
 --- b/Android.bp
 +++ a/Android.bp
-@@ -64,10 +64,14 @@
+@@ -64,7 +64,7 @@
          "range_inclusive",
          "serde_derive",
          "std_atomic",
@@ -11,10 +11,3 @@ index 41d67cc..277296f 100644
          "systemtime_checked_add",
      ],
      proc_macros: ["libserde_derive"],
-+    apex_available: [
-+        "//apex_available:platform",
-+        "com.android.virt",
-+    ],
- }
- 
- // dependent_library ["feature_list"]