Snap for 7302914 from b5c3448423bff18a6ef1808ee91c19a96dec8d61 to sc-d1-release
Change-Id: I33155c03a1741dead15a15c4e2e2283f34439995
diff --git a/Android.bp b/Android.bp
index 9d3e39c..009e0e4 100644
--- a/Android.bp
+++ b/Android.bp
@@ -86,22 +86,22 @@
"--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 @@
// 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 f4c0606..2ec02dd 100644
--- a/patches/Android.bp.patch
+++ b/patches/Android.bp.patch
@@ -92,22 +92,22 @@
+ "--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",
+ ]
+ }
+
