aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernie Innocenti <codewiz@google.com>2020-12-14 14:23:11 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-12-14 14:23:11 +0000
commita92bea40f6d102bbe433d3328e033aa4cd3a799b (patch)
tree3db638ff2d9e4b6bb01c299ef697b4b668843413
parentb44e7f1aa3c63af3cfcbbeeadd91ab29a4aa5c66 (diff)
parente48f9b9f5c1766c0b2bb811ffef8c726fc4f2937 (diff)
downloadlibm-a92bea40f6d102bbe433d3328e033aa4cd3a799b.tar.gz
Allow using liblibm from DnsResolver am: afabc12c7e am: e48f9b9f5c
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/libm/+/1526468 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I81c0552266b7df75142fe6e393706e8b37a468f0
-rw-r--r--Android.bp7
-rw-r--r--patches/Android.bp.diff12
2 files changed, 18 insertions, 1 deletions
diff --git a/Android.bp b/Android.bp
index 004695d..682f09d 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.diff.
rust_library {
name: "liblibm",
@@ -7,6 +7,11 @@ rust_library {
srcs: ["src/lib.rs"],
edition: "2018",
features: ["default"],
+ apex_available: [
+ "//apex_available:platform",
+ "com.android.resolv",
+ ],
+ min_sdk_version: "29",
}
rust_defaults {
diff --git a/patches/Android.bp.diff b/patches/Android.bp.diff
new file mode 100644
index 0000000..003ea83
--- /dev/null
+++ b/patches/Android.bp.diff
@@ -0,0 +1,12 @@
+--- Android.bp 2020-12-14 19:07:52.362403999 +0900
++++ Android.bp.new 2020-12-14 19:07:02.566865770 +0900
+@@ -7,4 +7,9 @@ rust_library {
+ srcs: ["src/lib.rs"],
+ edition: "2018",
+ features: ["default"],
++ apex_available: [
++ "//apex_available:platform",
++ "com.android.resolv",
++ ],
++ min_sdk_version: "29",
+ }