diff options
| author | Joel Galenson <jgalenson@google.com> | 2021-04-20 20:44:53 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-20 20:44:53 +0000 |
| commit | 5ef42de86a52d53aebf6a38a85fccd7a865e5c91 (patch) | |
| tree | 334e0af0074b51a11b6cbf4b733ced7d067a9738 | |
| parent | da7fcb3740cc436fbfe10be98c0b7624cef27845 (diff) | |
| parent | b5c3448423bff18a6ef1808ee91c19a96dec8d61 (diff) | |
| download | grpcio-sys-android12L-d2-release.tar.gz | |
Use the new more inclusive command-line options. am: 9225803a0f am: 6f65f18de4 am: 50d1fe9265 am: b5c3448423android-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-release
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/grpcio-sys/+/1681206
Change-Id: Ib4806545e2453c543d8df8bcf174ae0e61afd6c3
| -rw-r--r-- | Android.bp | 36 | ||||
| -rw-r--r-- | patches/Android.bp.patch | 32 |
2 files changed, 34 insertions, 34 deletions
@@ -86,22 +86,22 @@ rust_bindgen { "--size_t-is-usize", "--constified-enum-module grpc_status_code", "--default-enum-style rust", - "--whitelist-function=\\bgrpc_.*", - "--whitelist-function=\\bgpr_.*", - "--whitelist-function=\\bgrpcwrap_.*", - "--whitelist-var=\\bGRPC_.*", - "--whitelist-type=\\bgrpc_.*", - "--whitelist-type=\\bgpr_.*", - "--whitelist-type=\\bgrpcwrap_.*", - "--whitelist-type=\\bcensus_context.*", - "--whitelist-type=\\bverify_peer_options.*", - "--blacklist-type=(__)?pthread.*", - "--blacklist-function=\\bgpr_mu_.*", - "--blacklist-function=\\bgpr_cv_.*", - "--blacklist-function=\\bgpr_once_.*", - "--blacklist-type=gpr_mu", - "--blacklist-type=gpr_cv", - "--blacklist-type=gpr_once", + "--allowlist-function=\\bgrpc_.*", + "--allowlist-function=\\bgpr_.*", + "--allowlist-function=\\bgrpcwrap_.*", + "--allowlist-var=\\bGRPC_.*", + "--allowlist-type=\\bgrpc_.*", + "--allowlist-type=\\bgpr_.*", + "--allowlist-type=\\bgrpcwrap_.*", + "--allowlist-type=\\bcensus_context.*", + "--allowlist-type=\\bverify_peer_options.*", + "--blocklist-type=(__)?pthread.*", + "--blocklist-function=\\bgpr_mu_.*", + "--blocklist-function=\\bgpr_cv_.*", + "--blocklist-function=\\bgpr_once_.*", + "--blocklist-type=gpr_mu", + "--blocklist-type=gpr_cv", + "--blocklist-type=gpr_once", ] } @@ -112,12 +112,12 @@ rust_bindgen { // cc-1.0.67 // cexpr-0.4.0 // cfg-if-1.0.0 -// clang-sys-1.1.1 "clang_3_5,clang_3_6,clang_3_7,clang_3_8,clang_3_9,clang_4_0,clang_5_0,clang_6_0,libloading,runtime" +// clang-sys-1.2.0 "clang_3_5,clang_3_6,clang_3_7,clang_3_8,clang_3_9,clang_4_0,clang_5_0,clang_6_0,libloading,runtime" // cmake-0.1.45 // glob-0.3.0 // lazy_static-1.4.0 // lazycell-1.3.0 -// libc-0.2.92 "default,std" +// libc-0.2.93 "default,std" // libloading-0.7.0 // libz-sys-1.1.2 "default,libc,static,stock-zlib" // memchr-2.3.4 "std,use_std" diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch index f4c06064..2ec02dd2 100644 --- a/patches/Android.bp.patch +++ b/patches/Android.bp.patch @@ -92,22 +92,22 @@ index 45707bc..d0369e6 100644 + "--size_t-is-usize", + "--constified-enum-module grpc_status_code", + "--default-enum-style rust", -+ "--whitelist-function=\\bgrpc_.*", -+ "--whitelist-function=\\bgpr_.*", -+ "--whitelist-function=\\bgrpcwrap_.*", -+ "--whitelist-var=\\bGRPC_.*", -+ "--whitelist-type=\\bgrpc_.*", -+ "--whitelist-type=\\bgpr_.*", -+ "--whitelist-type=\\bgrpcwrap_.*", -+ "--whitelist-type=\\bcensus_context.*", -+ "--whitelist-type=\\bverify_peer_options.*", -+ "--blacklist-type=(__)?pthread.*", -+ "--blacklist-function=\\bgpr_mu_.*", -+ "--blacklist-function=\\bgpr_cv_.*", -+ "--blacklist-function=\\bgpr_once_.*", -+ "--blacklist-type=gpr_mu", -+ "--blacklist-type=gpr_cv", -+ "--blacklist-type=gpr_once", ++ "--allowlist-function=\\bgrpc_.*", ++ "--allowlist-function=\\bgpr_.*", ++ "--allowlist-function=\\bgrpcwrap_.*", ++ "--allowlist-var=\\bGRPC_.*", ++ "--allowlist-type=\\bgrpc_.*", ++ "--allowlist-type=\\bgpr_.*", ++ "--allowlist-type=\\bgrpcwrap_.*", ++ "--allowlist-type=\\bcensus_context.*", ++ "--allowlist-type=\\bverify_peer_options.*", ++ "--blocklist-type=(__)?pthread.*", ++ "--blocklist-function=\\bgpr_mu_.*", ++ "--blocklist-function=\\bgpr_cv_.*", ++ "--blocklist-function=\\bgpr_once_.*", ++ "--blocklist-type=gpr_mu", ++ "--blocklist-type=gpr_cv", ++ "--blocklist-type=gpr_once", + ] + } + |