Allow using untrusted from DnsResolverplatform-tools-31.0.0

Bug: 155855709
Test: m
Change-Id: I0dee0cb7b78d62e693a95032c6fe97ffdc171a9d

2 files changed, 22 insertions, 1 deletions

diff --git a/Android.bp b/Android.bp
index 52ab13d..74d097a 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --run --device --dependencies --tests.
+// This file is generated by cargo2android.py --run --device --dependencies --tests --patch=patches/Android.bp.patch.
 
 rust_library {
     name: "libuntrusted",
@@ -6,6 +6,11 @@ rust_library {
     crate_name: "untrusted",
     srcs: ["src/untrusted.rs"],
     edition: "2018",
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.resolv",
+    ],
+    min_sdk_version: "29",
 }
 
 rust_defaults {
diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch
new file mode 100644
index 0000000..90cc841
--- /dev/null
+++ b/patches/Android.bp.patch
@@ -0,0 +1,16 @@
+diff --git a/Android.bp b/Android.bp
+index 52ab13d..eaf9020 100644
+--- a/Android.bp
++++ b/Android.bp
+@@ -6,6 +6,11 @@ rust_library {
+     crate_name: "untrusted",
+     srcs: ["src/untrusted.rs"],
+     edition: "2018",
++    apex_available: [
++        "//apex_available:platform",
++        "com.android.resolv",
++    ],
++    min_sdk_version: "29",
+ }
+ 
+ rust_defaults {