summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-03-23 19:27:53 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-03-23 19:27:53 +0000
commitb77289495cc4c4c8dfcd970f89cce12fb4650f8e (patch)
treec2eb33e9f35209fc54055b6b567986219c3c37f4
parent9b74ec1711b7068f3fc6e2b179f420692770e8b0 (diff)
parent3405125c2112ee0672fe8c351277431c344b1af1 (diff)
downloadgrpcio-sys-b77289495cc4c4c8dfcd970f89cce12fb4650f8e.tar.gz
Snap for 8346178 from 3405125c2112ee0672fe8c351277431c344b1af1 to simpleperf-release
Change-Id: Ibbeecfe51ccde3aa38e0a82d8e731238ee4f2b20
-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 {