commit 1ed8dd119571a370407534dfdf6662bb5c809d4a
author Yash Tibrewal <yashkt@google.com> Fri Oct 06 14:54:05 2017 -0700
committer GitHub <noreply@github.com> Fri Oct 06 14:54:05 2017 -0700
tree e3cee849809602f1eabc8e3dba0d0b810f3f28cd
parent de4c432f94cee9064abe16638fe80d95ea294396
parent 598cbd882d5fc8caf7e72e8186c1896d4af1824c

Merge pull request #12869 from yashykt/logandroid

extern C for gpr_default_log in android

src/core/lib/iomgr/block_annotate.h

diff --git a/src/core/lib/iomgr/block_annotate.h b/src/core/lib/iomgr/block_annotate.h
index cbcb5d9..fcbfe9e 100644
--- a/src/core/lib/iomgr/block_annotate.h
+++ b/src/core/lib/iomgr/block_annotate.h
@@ -39,9 +39,14 @@
   do {                                        \
     gpr_thd_start_blocking_region();          \
   } while (0)
-#define GRPC_SCHEDULING_END_BLOCKING_REGION \
-  do {                                      \
-    gpr_thd_end_blocking_region();          \
+#define GRPC_SCHEDULING_END_BLOCKING_REGION_NO_EXEC_CTX \
+  do {                                                  \
+    gpr_thd_end_blocking_region();                      \
+  } while (0)
+#define GRPC_SCHEDULING_END_BLOCKING_REGION_WITH_EXEC_CTX(ec) \
+  do {                                                        \
+    gpr_thd_end_blocking_region();                            \
+    grpc_exec_ctx_invalidate_now((ec));                       \
   } while (0)
 #else
 #define GRPC_SCHEDULING_START_BLOCKING_REGION \

tools/internal_ci/linux/grpc_interop_toprod.sh

diff --git a/tools/internal_ci/linux/grpc_interop_toprod.sh b/tools/internal_ci/linux/grpc_interop_toprod.sh
index 3d06185..97a7d5d 100755
--- a/tools/internal_ci/linux/grpc_interop_toprod.sh
+++ b/tools/internal_ci/linux/grpc_interop_toprod.sh
@@ -28,5 +28,5 @@
     --cloud_to_prod \
     --cloud_to_prod_auth \
     --prod_servers default gateway_v4 \
-    --use_docker --internal_ci -t -j 12 $@
+    --use_docker --internal_ci --allow_flakes -t -j 12 $@