summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Vander Stoep <jeffv@google.com>2020-12-23 12:20:18 +0100
committerJeff Vander Stoep <jeffv@google.com>2020-12-23 12:28:26 +0100
commit28b25f967fea16ceeb056e6b7ee69de27527d3ea (patch)
tree9c489d40ee0b462f754ac75139a46b2c2228df1c
parent766c8d344063a5868a8179a5a86d70294238503c (diff)
downloadmatches-28b25f967fea16ceeb056e6b7ee69de27527d3ea.tar.gz
Allow using matches from DnsResolver
Test: m Bug: 155855709 Change-Id: I35a7fbf06eb8cd16e4f2a1c46a68956b18d38216
-rw-r--r--Android.bp7
-rw-r--r--patches/Android.bp.patch16
2 files changed, 22 insertions, 1 deletions
diff --git a/Android.bp b/Android.bp
index de4144e..95882d0 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: "libmatches",
@@ -7,6 +7,11 @@ rust_library {
crate_name: "matches",
srcs: ["lib.rs"],
edition: "2015",
+ 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..d7fd1ba
--- /dev/null
+++ b/patches/Android.bp.patch
@@ -0,0 +1,16 @@
+diff --git a/Android.bp b/Android.bp
+index de4144e..dc2efcc 100644
+--- a/Android.bp
++++ b/Android.bp
+@@ -7,6 +7,11 @@ rust_library {
+ crate_name: "matches",
+ srcs: ["lib.rs"],
+ edition: "2015",
++ apex_available: [
++ "//apex_available:platform",
++ "com.android.resolv",
++ ],
++ min_sdk_version: "29",
+ }
+
+ rust_defaults {