Generate apex_available from c2a instead of a patch am: d00e1ff9c4 am: f5d829f250 am: caf840c5c9 am: 0508ccd776android-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/spin/+/1689918

Change-Id: I7f0d3791f7e59d01e76d8740732ddb7d387eef7e

3 files changed, 17 insertions, 11 deletions

diff --git a/Android.bp b/Android.bp
index 79d2971..5d95d6d 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_spin_license"],
diff --git a/cargo2android.json b/cargo2android.json
new file mode 100644
index 0000000..5441827
--- /dev/null
+++ b/cargo2android.json
@@ -0,0 +1,12 @@
+{
+  "apex-available": [
+    "//apex_available:platform",
+    "com.android.resolv"
+  ],
+  "dependencies": true,
+  "device": true,
+  "min-sdk-version": "29",
+  "patch": "patches/Android.bp.patch",
+  "run": true,
+  "tests": true
+}
\ No newline at end of file
diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch
index e8aa924..f606cb9 100644
--- a/patches/Android.bp.patch
+++ b/patches/Android.bp.patch
@@ -2,22 +2,15 @@ diff --git a/Android.bp b/Android.bp
 index 96531ab..43db8ef 100644
 --- a/Android.bp
 +++ b/Android.bp
-@@ -8,8 +8,14 @@ rust_library {
+@@ -39,6 +39,7 @@ rust_library {
      edition: "2015",
      features: [
          "default",
 +        "std",
          "ticket_mutex",
      ],
-+    apex_available: [
-+        "//apex_available:platform",
-+        "com.android.resolv",
-+    ],
-+    min_sdk_version: "29",
- }
- 
- rust_defaults {
-@@ -21,6 +27,7 @@ rust_defaults {
+    apex_available: [
+@@ -56,6 +62,7 @@ rust_defaults {
      edition: "2015",
      features: [
          "default",