commit 2997c939feed2eafd80bb7119e4d3593c08d02a5
author Joel Galenson <jgalenson@google.com> Mon May 17 17:33:28 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon May 17 17:33:28 2021 +0000
tree 77bb7a1a67ab1b11c1f1612694b5e424e3e78d5d
parent b3d10ec058bf93380af775f8159fc02211e9c1b3
parent 37d8455baab7d1843cd404ac64c102c55c416b55

Generate apex_available from c2a instead of a patch am: 3f92d191de am: fc011c2e3d am: 16fc4abb85 am: e50bf47b4a am: 37d8455baa

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/android_log-sys/+/1687129

Change-Id: I4b0e9f9db8cf89248b78f4cf370a1eebc0603f73

Android.bp

diff --git a/Android.bp b/Android.bp
index 37e3a31..268bd8f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -53,6 +53,8 @@
     },
     apex_available: [
         "//apex_available:platform",
+        "com.android.resolv",
         "com.android.virt",
     ],
+    min_sdk_version: "29",
 }

cargo2android.json

diff --git a/cargo2android.json b/cargo2android.json
index 623aa56..80540e9 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -1,8 +1,10 @@
 {
   "apex-available": [
     "//apex_available:platform",
+    "com.android.resolv",
     "com.android.virt"
   ],
+  "min_sdk_version": "29",
   "dependencies": true,
   "device": true,
   "patch": "patches/Android.bp.patch",

patches/Android.bp.patch

diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch
index b458dd2..988834c 100644
--- a/patches/Android.bp.patch
+++ b/patches/Android.bp.patch
@@ -12,4 +12,4 @@
 +    },
      apex_available: [
          "//apex_available:platform",
-         "com.android.virt",
+         "com.android.resolv",