summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoopa Sattiraju <sattiraju@google.com>2022-02-03 03:30:02 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-02-03 03:30:02 +0000
commit722a0e2441df03764672396debf2d6ebfbcbf0e9 (patch)
treec2eb33e9f35209fc54055b6b567986219c3c37f4
parent1455e4ef8fa18ee7628f53d674a62367c2bf1ab8 (diff)
parent9d6e46996fe19153b646c3cfced39f0c3e74ef22 (diff)
downloadgrpcio-sys-722a0e2441df03764672396debf2d6ebfbcbf0e9.tar.gz
Adding min_sdk_version to libgrpc_bindgen am: ead5592d57 am: f4b2eb0972 am: 2c81e863bf am: 9d6e46996f
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/grpcio-sys/+/1966312 Change-Id: I55b2031b43527f31acff1496439f24d44903e6f5
-rw-r--r--Android.bp3
-rw-r--r--patches/Android.bp.patch5
2 files changed, 5 insertions, 3 deletions
diff --git a/Android.bp b/Android.bp
index 1256ee50..399a8c0b 100644
--- a/Android.bp
+++ b/Android.bp
@@ -114,7 +114,8 @@ rust_bindgen {
"--blocklist-type=gpr_mu",
"--blocklist-type=gpr_cv",
"--blocklist-type=gpr_once",
- ]
+ ],
+ min_sdk_version: "29",
}
rust_test {
diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch
index 202a5742..d97431fd 100644
--- a/patches/Android.bp.patch
+++ b/patches/Android.bp.patch
@@ -14,7 +14,7 @@ index 45707bc..d0369e6 100644
edition: "2018",
features: [
"bindgen",
-@@ -55,52 +55,74 @@
+@@ -55,52 +55,75 @@
"liblibc",
"liblibz_sys",
],
@@ -119,7 +119,8 @@ index 45707bc..d0369e6 100644
+ "--blocklist-type=gpr_mu",
+ "--blocklist-type=gpr_cv",
+ "--blocklist-type=gpr_once",
-+ ]
++ ],
++ min_sdk_version: "29",
+}
+
+rust_test {