Use the new more inclusive command-line options. am: 9225803a0f am: 6f65f18de4 am: 50d1fe9265 am: b5c3448423android-mainline-12.0.0_r99android-mainline-12.0.0_r98android-mainline-12.0.0_r97android-mainline-12.0.0_r96android-mainline-12.0.0_r95android-mainline-12.0.0_r94android-mainline-12.0.0_r93android-mainline-12.0.0_r92android-mainline-12.0.0_r91android-mainline-12.0.0_r90android-mainline-12.0.0_r9android-mainline-12.0.0_r89android-mainline-12.0.0_r88android-mainline-12.0.0_r87android-mainline-12.0.0_r86android-mainline-12.0.0_r85android-mainline-12.0.0_r84android-mainline-12.0.0_r83android-mainline-12.0.0_r82android-mainline-12.0.0_r81android-mainline-12.0.0_r80android-mainline-12.0.0_r8android-mainline-12.0.0_r79android-mainline-12.0.0_r78android-mainline-12.0.0_r77android-mainline-12.0.0_r76android-mainline-12.0.0_r75android-mainline-12.0.0_r74android-mainline-12.0.0_r73android-mainline-12.0.0_r72android-mainline-12.0.0_r71android-mainline-12.0.0_r70android-mainline-12.0.0_r7android-mainline-12.0.0_r69android-mainline-12.0.0_r68android-mainline-12.0.0_r67android-mainline-12.0.0_r66android-mainline-12.0.0_r65android-mainline-12.0.0_r64android-mainline-12.0.0_r63android-mainline-12.0.0_r62android-mainline-12.0.0_r61android-mainline-12.0.0_r60android-mainline-12.0.0_r6android-mainline-12.0.0_r59android-mainline-12.0.0_r58android-mainline-12.0.0_r57android-mainline-12.0.0_r56android-mainline-12.0.0_r53android-mainline-12.0.0_r52android-mainline-12.0.0_r51android-mainline-12.0.0_r50android-mainline-12.0.0_r5android-mainline-12.0.0_r49android-mainline-12.0.0_r48android-mainline-12.0.0_r47android-mainline-12.0.0_r46android-mainline-12.0.0_r45android-mainline-12.0.0_r44android-mainline-12.0.0_r43android-mainline-12.0.0_r42android-mainline-12.0.0_r41android-mainline-12.0.0_r40android-mainline-12.0.0_r39android-mainline-12.0.0_r38android-mainline-12.0.0_r37android-mainline-12.0.0_r35android-mainline-12.0.0_r34android-mainline-12.0.0_r33android-mainline-12.0.0_r32android-mainline-12.0.0_r31android-mainline-12.0.0_r30android-mainline-12.0.0_r3android-mainline-12.0.0_r29android-mainline-12.0.0_r28android-mainline-12.0.0_r27android-mainline-12.0.0_r26android-mainline-12.0.0_r25android-mainline-12.0.0_r24android-mainline-12.0.0_r23android-mainline-12.0.0_r22android-mainline-12.0.0_r21android-mainline-12.0.0_r20android-mainline-12.0.0_r2android-mainline-12.0.0_r19android-mainline-12.0.0_r18android-mainline-12.0.0_r17android-mainline-12.0.0_r16android-mainline-12.0.0_r15android-mainline-12.0.0_r14android-mainline-12.0.0_r13android-mainline-12.0.0_r126android-mainline-12.0.0_r125android-mainline-12.0.0_r124android-mainline-12.0.0_r123android-mainline-12.0.0_r122android-mainline-12.0.0_r121android-mainline-12.0.0_r120android-mainline-12.0.0_r12android-mainline-12.0.0_r119android-mainline-12.0.0_r118android-mainline-12.0.0_r117android-mainline-12.0.0_r116android-mainline-12.0.0_r115android-mainline-12.0.0_r114android-mainline-12.0.0_r113android-mainline-12.0.0_r110android-mainline-12.0.0_r11android-mainline-12.0.0_r109android-mainline-12.0.0_r108android-mainline-12.0.0_r107android-mainline-12.0.0_r106android-mainline-12.0.0_r105android-mainline-12.0.0_r104android-mainline-12.0.0_r103android-mainline-12.0.0_r102android-mainline-12.0.0_r101android-mainline-12.0.0_r100android-mainline-12.0.0_r10android-mainline-12.0.0_r1aml_wif_311811030aml_tz3_311312010aml_tet_311811050aml_sdk_311710000aml_pco_311011000aml_mpr_311911090aml_doc_310851020android12-mainline-wifi-releaseandroid12-mainline-tethering-releaseandroid12-mainline-statsd-releaseandroid12-mainline-sdkext-releaseandroid12-mainline-resolv-releaseandroid12-mainline-permission-releaseandroid12-mainline-neuralnetworks-releaseandroid12-mainline-networkstack-releaseandroid12-mainline-mediaprovider-releaseandroid12-mainline-media-swcodec-releaseandroid12-mainline-media-releaseandroid12-mainline-ipsec-releaseandroid12-mainline-extservices-releaseandroid12-mainline-documentsui-releaseandroid12-mainline-conscrypt-releaseandroid12-mainline-cellbroadcast-releaseandroid12-mainline-captiveportallogin-releaseandroid12-mainline-art-releaseandroid12-mainline-adbd-release

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/grpcio-sys/+/1681206

Change-Id: I9e1eda022b3c4604dd473d420dd7bbe3fe53d104

2 files changed, 34 insertions, 34 deletions

diff --git a/Android.bp b/Android.bp
index 9d3e39cf..009e0e40 100644
--- a/Android.bp
+++ b/Android.bp
@@ -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",
 +    ]
 + }
 +