diff options
| author | Bernie Innocenti <codewiz@google.com> | 2020-12-14 14:19:03 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-14 14:19:03 +0000 |
| commit | 1699b084be392acd132fa09902672e907baedc39 (patch) | |
| tree | 3ac09c51d21c811b6f60ef1d2e4e2f3c28705471 | |
| parent | 8fcc90ed7b0b321c58bd5cfc423ddf47a858f38b (diff) | |
| parent | b0aa0a14115132e8f1459c1f96c3575f0296b9fe (diff) | |
| download | cfg-if-1699b084be392acd132fa09902672e907baedc39.tar.gz | |
Allow using cfg-if from DnsResolver am: b0aa0a1411
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/cfg-if/+/1526579
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I468ac194917d7dea6b188886a339cf872d6061d5
| -rw-r--r-- | Android.bp | 7 | ||||
| -rw-r--r-- | patches/Android.bp.patch | 12 |
2 files changed, 18 insertions, 1 deletions
@@ -1,4 +1,4 @@ -// This file is generated by cargo2android.py --run --dependencies --tests --device. +// This file is generated by cargo2android.py --run --dependencies --tests --device --patch=patches/Android.bp.patch. rust_defaults { name: "cfg-if_defaults", @@ -47,4 +47,9 @@ rust_library { crate_name: "cfg_if", srcs: ["src/lib.rs"], edition: "2018", + apex_available: [ + "//apex_available:platform", + "com.android.resolv", + ], + min_sdk_version: "29", } diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch new file mode 100644 index 0000000..366c2c4 --- /dev/null +++ b/patches/Android.bp.patch @@ -0,0 +1,12 @@ +--- Android.bp 2020-12-14 21:46:29.182898941 +0900 ++++ Android.bp.new 2020-12-14 21:20:17.887466778 +0900 +@@ -47,4 +47,9 @@ rust_library { + crate_name: "cfg_if", + srcs: ["src/lib.rs"], + edition: "2018", ++ apex_available: [ ++ "//apex_available:platform", ++ "com.android.resolv", ++ ], ++ min_sdk_version: "29", + } |