aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Vander Stoep <jeffv@google.com>2020-12-23 12:45:02 +0100
committerJeff Vander Stoep <jeffv@google.com>2020-12-23 12:45:02 +0100
commit6d0a4fc0e69c98181299d8c6a6f8032f049d95fc (patch)
treed0ba4e03b77ba88e794112de7a131aa59b696935
parent12dce91d4a50cbc60e149c8f5ead34fbfe27ecca (diff)
downloadunicode-normalization-6d0a4fc0e69c98181299d8c6a6f8032f049d95fc.tar.gz
Allow using unicode-normalization from DnsResolverplatform-tools-31.0.0
Test: m Bug: 155855709 Change-Id: I9705b5f3430a67bf776081cbdc4d2f00454edef8
-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 9816f84..b4ce29c 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: "libunicode_normalization",
@@ -13,6 +13,11 @@ rust_library {
rustlibs: [
"libtinyvec",
],
+ 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..4d02544
--- /dev/null
+++ b/patches/Android.bp.patch
@@ -0,0 +1,16 @@
+diff --git a/Android.bp b/Android.bp
+index 9816f84..e294c9b 100644
+--- a/Android.bp
++++ b/Android.bp
+@@ -13,6 +13,11 @@ rust_library {
+ rustlibs: [
+ "libtinyvec",
+ ],
++ apex_available: [
++ "//apex_available:platform",
++ "com.android.resolv",
++ ],
++ min_sdk_version: "29",
+ }
+
+ rust_defaults {