Snap for 7302914 from b5c3448423bff18a6ef1808ee91c19a96dec8d61 to sc-releaseandroid-vts-12.0_r9android-vts-12.0_r8android-vts-12.0_r7android-vts-12.0_r6android-vts-12.0_r5android-vts-12.0_r4android-vts-12.0_r3android-vts-12.0_r2android-vts-12.0_r12android-vts-12.0_r11android-vts-12.0_r10android-vts-12.0_r1android-security-12.0.0_r59android-security-12.0.0_r58android-security-12.0.0_r57android-security-12.0.0_r56android-security-12.0.0_r55android-security-12.0.0_r54android-security-12.0.0_r53android-security-12.0.0_r52android-security-12.0.0_r51android-security-12.0.0_r50android-security-12.0.0_r49android-security-12.0.0_r48android-security-12.0.0_r47android-security-12.0.0_r46android-security-12.0.0_r45android-security-12.0.0_r44android-security-12.0.0_r43android-security-12.0.0_r42android-security-12.0.0_r41android-security-12.0.0_r40android-security-12.0.0_r39android-security-12.0.0_r38android-security-12.0.0_r37android-security-12.0.0_r36android-security-12.0.0_r35android-security-12.0.0_r34android-security-11.0.0_r71android-platform-12.0.0_r9android-platform-12.0.0_r8android-platform-12.0.0_r7android-platform-12.0.0_r6android-platform-12.0.0_r5android-platform-12.0.0_r4android-platform-12.0.0_r31android-platform-12.0.0_r30android-platform-12.0.0_r3android-platform-12.0.0_r29android-platform-12.0.0_r28android-platform-12.0.0_r27android-platform-12.0.0_r26android-platform-12.0.0_r25android-platform-12.0.0_r24android-platform-12.0.0_r23android-platform-12.0.0_r22android-platform-12.0.0_r21android-platform-12.0.0_r20android-platform-12.0.0_r2android-platform-12.0.0_r19android-platform-12.0.0_r18android-platform-12.0.0_r17android-platform-12.0.0_r16android-platform-12.0.0_r15android-platform-12.0.0_r14android-platform-12.0.0_r13android-platform-12.0.0_r12android-platform-12.0.0_r11android-platform-12.0.0_r10android-platform-12.0.0_r1android-cts-12.0_r9android-cts-12.0_r8android-cts-12.0_r7android-cts-12.0_r6android-cts-12.0_r5android-cts-12.0_r4android-cts-12.0_r3android-cts-12.0_r2android-cts-12.0_r12android-cts-12.0_r11android-cts-12.0_r10android-cts-12.0_r1android-12.0.0_r9android-12.0.0_r8android-12.0.0_r34android-12.0.0_r33android-12.0.0_r31android-12.0.0_r30android-12.0.0_r3android-12.0.0_r25android-12.0.0_r2android-12.0.0_r11android-12.0.0_r10android-12.0.0_r1android12-tests-releaseandroid12-security-releaseandroid12-s5-releaseandroid12-s4-releaseandroid12-s3-releaseandroid12-s2-releaseandroid12-s1-releaseandroid12-releaseandroid12-platform-release

Change-Id: Iba6ea6de4c973535b64e7b0175af2e7b00cacc1b

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",
 +    ]
 + }
 +