merge

1 files changed, 142 insertions, 397 deletions

diff --git a/build.yaml b/build.yaml
index 188de19e71..dc2b90fe18 100644
--- a/build.yaml
+++ b/build.yaml
@@ -21,6 +21,91 @@ filegroups:
   - src/core/census/operation.c
   - src/core/census/placeholders.c
   - src/core/census/tracing.c
+- name: gpr
+  public_headers:
+  - include/grpc/support/alloc.h
+  - include/grpc/support/atm.h
+  - include/grpc/support/atm_gcc_atomic.h
+  - include/grpc/support/atm_gcc_sync.h
+  - include/grpc/support/atm_win32.h
+  - include/grpc/support/avl.h
+  - include/grpc/support/cmdline.h
+  - include/grpc/support/cpu.h
+  - include/grpc/support/histogram.h
+  - include/grpc/support/host_port.h
+  - include/grpc/support/log.h
+  - include/grpc/support/log_win32.h
+  - include/grpc/support/port_platform.h
+  - include/grpc/support/slice.h
+  - include/grpc/support/slice_buffer.h
+  - include/grpc/support/string_util.h
+  - include/grpc/support/subprocess.h
+  - include/grpc/support/sync.h
+  - include/grpc/support/sync_generic.h
+  - include/grpc/support/sync_posix.h
+  - include/grpc/support/sync_win32.h
+  - include/grpc/support/thd.h
+  - include/grpc/support/time.h
+  - include/grpc/support/tls.h
+  - include/grpc/support/tls_gcc.h
+  - include/grpc/support/tls_msvc.h
+  - include/grpc/support/tls_pthread.h
+  - include/grpc/support/useful.h
+  headers:
+  - src/core/profiling/timers.h
+  - src/core/support/block_annotate.h
+  - src/core/support/env.h
+  - src/core/support/file.h
+  - src/core/support/murmur_hash.h
+  - src/core/support/stack_lockfree.h
+  - src/core/support/string.h
+  - src/core/support/string_win32.h
+  - src/core/support/thd_internal.h
+  - src/core/support/time_precise.h
+  src:
+  - src/core/profiling/basic_timers.c
+  - src/core/profiling/stap_timers.c
+  - src/core/support/alloc.c
+  - src/core/support/avl.c
+  - src/core/support/cmdline.c
+  - src/core/support/cpu_iphone.c
+  - src/core/support/cpu_linux.c
+  - src/core/support/cpu_posix.c
+  - src/core/support/cpu_windows.c
+  - src/core/support/env_linux.c
+  - src/core/support/env_posix.c
+  - src/core/support/env_win32.c
+  - src/core/support/file.c
+  - src/core/support/file_posix.c
+  - src/core/support/file_win32.c
+  - src/core/support/histogram.c
+  - src/core/support/host_port.c
+  - src/core/support/log.c
+  - src/core/support/log_android.c
+  - src/core/support/log_linux.c
+  - src/core/support/log_posix.c
+  - src/core/support/log_win32.c
+  - src/core/support/murmur_hash.c
+  - src/core/support/slice.c
+  - src/core/support/slice_buffer.c
+  - src/core/support/stack_lockfree.c
+  - src/core/support/string.c
+  - src/core/support/string_posix.c
+  - src/core/support/string_win32.c
+  - src/core/support/subprocess_posix.c
+  - src/core/support/subprocess_windows.c
+  - src/core/support/sync.c
+  - src/core/support/sync_posix.c
+  - src/core/support/sync_win32.c
+  - src/core/support/thd.c
+  - src/core/support/thd_posix.c
+  - src/core/support/thd_win32.c
+  - src/core/support/time.c
+  - src/core/support/time_posix.c
+  - src/core/support/time_precise.c
+  - src/core/support/time_win32.c
+  - src/core/support/tls_pthread.c
+  - src/core/support/wrap_memcpy.c
 - name: grpc++_base
   public_headers:
   - include/grpc++/channel.h
@@ -413,6 +498,7 @@ filegroups:
   - test/core/util/parse_hexstring.h
   - test/core/util/port.h
   - test/core/util/slice_splitter.h
+  - test/core/util/test_config.h
   src:
   - test/core/end2end/cq_verifier.c
   - test/core/end2end/fixtures/proxy.c
@@ -422,108 +508,8 @@ filegroups:
   - test/core/util/port_posix.c
   - test/core/util/port_windows.c
   - test/core/util/slice_splitter.c
-libs:
-- name: gpr
-  build: all
-  language: c
-  public_headers:
-  - include/grpc/support/alloc.h
-  - include/grpc/support/atm.h
-  - include/grpc/support/atm_gcc_atomic.h
-  - include/grpc/support/atm_gcc_sync.h
-  - include/grpc/support/atm_win32.h
-  - include/grpc/support/avl.h
-  - include/grpc/support/cmdline.h
-  - include/grpc/support/cpu.h
-  - include/grpc/support/histogram.h
-  - include/grpc/support/host_port.h
-  - include/grpc/support/log.h
-  - include/grpc/support/log_win32.h
-  - include/grpc/support/port_platform.h
-  - include/grpc/support/slice.h
-  - include/grpc/support/slice_buffer.h
-  - include/grpc/support/string_util.h
-  - include/grpc/support/subprocess.h
-  - include/grpc/support/sync.h
-  - include/grpc/support/sync_generic.h
-  - include/grpc/support/sync_posix.h
-  - include/grpc/support/sync_win32.h
-  - include/grpc/support/thd.h
-  - include/grpc/support/time.h
-  - include/grpc/support/tls.h
-  - include/grpc/support/tls_gcc.h
-  - include/grpc/support/tls_msvc.h
-  - include/grpc/support/tls_pthread.h
-  - include/grpc/support/useful.h
-  headers:
-  - src/core/profiling/timers.h
-  - src/core/support/block_annotate.h
-  - src/core/support/env.h
-  - src/core/support/file.h
-  - src/core/support/murmur_hash.h
-  - src/core/support/stack_lockfree.h
-  - src/core/support/string.h
-  - src/core/support/string_win32.h
-  - src/core/support/thd_internal.h
-  - src/core/support/time_precise.h
-  src:
-  - src/core/profiling/basic_timers.c
-  - src/core/profiling/stap_timers.c
-  - src/core/support/alloc.c
-  - src/core/support/avl.c
-  - src/core/support/cmdline.c
-  - src/core/support/cpu_iphone.c
-  - src/core/support/cpu_linux.c
-  - src/core/support/cpu_posix.c
-  - src/core/support/cpu_windows.c
-  - src/core/support/env_linux.c
-  - src/core/support/env_posix.c
-  - src/core/support/env_win32.c
-  - src/core/support/file.c
-  - src/core/support/file_posix.c
-  - src/core/support/file_win32.c
-  - src/core/support/histogram.c
-  - src/core/support/host_port.c
-  - src/core/support/log.c
-  - src/core/support/log_android.c
-  - src/core/support/log_linux.c
-  - src/core/support/log_posix.c
-  - src/core/support/log_win32.c
-  - src/core/support/murmur_hash.c
-  - src/core/support/slice.c
-  - src/core/support/slice_buffer.c
-  - src/core/support/stack_lockfree.c
-  - src/core/support/string.c
-  - src/core/support/string_posix.c
-  - src/core/support/string_win32.c
-  - src/core/support/subprocess_posix.c
-  - src/core/support/subprocess_windows.c
-  - src/core/support/sync.c
-  - src/core/support/sync_posix.c
-  - src/core/support/sync_win32.c
-  - src/core/support/thd.c
-  - src/core/support/thd_posix.c
-  - src/core/support/thd_win32.c
-  - src/core/support/time.c
-  - src/core/support/time_posix.c
-  - src/core/support/time_precise.c
-  - src/core/support/time_win32.c
-  - src/core/support/tls_pthread.c
-  filegroups:
-  - grpc_codegen
-  secure: false
-  vs_project_guid: '{B23D3D1A-9438-4EDA-BEB6-9A0A03D17792}'
-- name: gpr_test_util
-  build: private
-  language: c
-  headers:
-  - test/core/util/test_config.h
-  src:
   - test/core/util/test_config.c
-  deps:
-  - gpr
-  secure: false
-  vs_project_guid: '{EAB0A629-17A9-44DB-B5FF-E91A721FE037}'
+libs:
 - name: grpc
   build: all
   language: c
@@ -566,12 +552,12 @@ libs:
   - src/core/tsi/fake_transport_security.c
   - src/core/tsi/ssl_transport_security.c
   - src/core/tsi/transport_security.c
-  deps:
-  - gpr
   baselib: true
   dll: true
   filegroups:
   - grpc_base
+  - gpr
+  - grpc_codegen
   - census
   secure: true
   vs_packages:
@@ -590,8 +576,6 @@ libs:
   - test/core/end2end/data/test_root_cert.c
   - test/core/security/oauth2_utils.c
   deps:
-  - gpr
-  - gpr_test_util
   - grpc
   filegroups:
   - grpc_test_util_base
@@ -600,8 +584,6 @@ libs:
   build: private
   language: c
   deps:
-  - gpr
-  - gpr_test_util
   - grpc_unsecure
   filegroups:
   - grpc_test_util_base
@@ -612,11 +594,11 @@ libs:
   language: c
   src:
   - src/core/surface/init_unsecure.c
-  deps:
-  - gpr
   baselib: true
   dll: true
   filegroups:
+  - gpr
+  - grpc_codegen
   - grpc_base
   - census
   secure: false
@@ -631,7 +613,6 @@ libs:
   src:
   - src/core/client_config/resolvers/zookeeper_resolver.c
   deps:
-  - gpr
   - grpc
   external_deps:
   - zookeeper
@@ -649,8 +630,6 @@ libs:
   - test_tcp_server
   - grpc_test_util
   - grpc
-  - gpr_test_util
-  - gpr
 - name: test_tcp_server
   build: private
   language: c
@@ -661,8 +640,6 @@ libs:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
-  - gpr
 - name: grpc++
   build: all
   language: c++
@@ -678,7 +655,6 @@ libs:
   - src/cpp/common/secure_create_auth_context.cc
   - src/cpp/server/secure_server_credentials.cc
   deps:
-  - gpr
   - grpc
   baselib: true
   dll: true
@@ -723,7 +699,6 @@ libs:
   src:
   - src/cpp/common/insecure_create_auth_context.cc
   deps:
-  - gpr
   - grpc_unsecure
   baselib: true
   dll: true
@@ -776,7 +751,6 @@ libs:
   - grpc_test_util
   - grpc++
   - grpc
-  - gpr
 - name: interop_client_main
   build: private
   language: c++
@@ -794,8 +768,6 @@ libs:
   - grpc_test_util
   - grpc++
   - grpc
-  - gpr_test_util
-  - gpr
   - grpc++_test_config
 - name: interop_server_helper
   build: private
@@ -808,7 +780,6 @@ libs:
   - grpc_test_util
   - grpc++
   - grpc
-  - gpr
 - name: interop_server_main
   build: private
   language: c++
@@ -823,8 +794,6 @@ libs:
   - grpc_test_util
   - grpc++
   - grpc
-  - gpr_test_util
-  - gpr
   - grpc++_test_config
 - name: qps
   build: private
@@ -871,7 +840,7 @@ libs:
   - src/csharp/ext/grpc_csharp_ext.c
   deps:
   - grpc
-  - gpr
+  LDFLAGS: $(if $(subst Linux,,$(SYSTEM)),,-Wl$(comma)-wrap$(comma)memcpy)
   deps_linkage: static
   dll: only
   vs_config_type: DynamicLibrary
@@ -893,8 +862,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
-  - gpr
 - name: algorithm_test
   build: test
   language: c
@@ -903,16 +870,14 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
-  - gpr
 - name: alloc_test
   build: test
   language: c
   src:
   - test/core/support/alloc_test.c
   deps:
-  - gpr_test_util
-  - gpr
+  - grpc_test_util
+  - grpc
 - name: alpn_test
   build: test
   language: c
@@ -921,8 +886,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
-  - gpr
 - name: bin_encoder_test
   build: test
   language: c
@@ -951,8 +914,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
-  - gpr
 - name: chttp2_hpack_encoder_test
   build: test
   language: c
@@ -961,8 +922,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
-  - gpr
 - name: chttp2_status_conversion_test
   build: test
   language: c
@@ -971,8 +930,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
-  - gpr
 - name: chttp2_stream_map_test
   build: test
   language: c
@@ -981,8 +938,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
-  - gpr
 - name: chttp2_varint_test
   build: test
   language: c
@@ -991,8 +946,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
-  - gpr
 - name: compression_test
   build: test
   language: c
@@ -1001,8 +954,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
-  - gpr
 - name: dns_resolver_test
   build: test
   language: c
@@ -1011,8 +962,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
-  - gpr
 - name: dualstack_socket_test
   cpu_cost: 0.1
   build: test
@@ -1022,8 +971,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
-  - gpr
   platforms:
   - mac
   - linux
@@ -1036,8 +983,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
-  - gpr
 - name: fd_conservation_posix_test
   build: test
   language: c
@@ -1046,8 +991,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
-  - gpr
   platforms:
   - mac
   - linux
@@ -1060,8 +1003,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
-  - gpr
   platforms:
   - mac
   - linux
@@ -1075,8 +1016,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
-  - gpr
 - name: fling_server
   build: test
   run: false
@@ -1086,8 +1025,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
-  - gpr
 - name: fling_stream_test
   cpu_cost: 2
   build: test
@@ -1097,8 +1034,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
-  - gpr
   platforms:
   - mac
   - linux
@@ -1112,8 +1047,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
-  - gpr
   platforms:
   - mac
   - linux
@@ -1124,7 +1057,6 @@ targets:
   src:
   - tools/codegen/core/gen_hpack_tables.c
   deps:
-  - gpr
   - grpc
 - name: gen_legal_metadata_characters
   build: tool
@@ -1138,80 +1070,80 @@ targets:
   src:
   - test/core/support/avl_test.c
   deps:
-  - gpr_test_util
-  - gpr
+  - grpc_test_util
+  - grpc
 - name: gpr_cmdline_test
   build: test
   language: c
   src:
   - test/core/support/cmdline_test.c
   deps:
-  - gpr_test_util
-  - gpr
+  - grpc_test_util
+  - grpc
 - name: gpr_cpu_test
   build: test
   language: c
   src:
   - test/core/support/cpu_test.c
   deps:
-  - gpr_test_util
-  - gpr
+  - grpc_test_util
+  - grpc
 - name: gpr_env_test
   build: test
   language: c
   src:
   - test/core/support/env_test.c
   deps:
-  - gpr_test_util
-  - gpr
+  - grpc_test_util
+  - grpc
 - name: gpr_file_test
   build: test
   language: c
   src:
   - test/core/support/file_test.c
   deps:
-  - gpr_test_util
-  - gpr
+  - grpc_test_util
+  - grpc
 - name: gpr_histogram_test
   build: test
   language: c
   src:
   - test/core/support/histogram_test.c
   deps:
-  - gpr_test_util
-  - gpr
+  - grpc_test_util
+  - grpc
 - name: gpr_host_port_test
   build: test
   language: c
   src:
   - test/core/support/host_port_test.c
   deps:
-  - gpr_test_util
-  - gpr
+  - grpc_test_util
+  - grpc
 - name: gpr_log_test
   build: test
   language: c
   src:
   - test/core/support/log_test.c
   deps:
-  - gpr_test_util
-  - gpr
+  - grpc_test_util
+  - grpc
 - name: gpr_slice_buffer_test
   build: test
   language: c
   src:
   - test/core/support/slice_buffer_test.c
   deps:
-  - gpr_test_util
-  - gpr
+  - grpc_test_util
+  - grpc
 - name: gpr_slice_test
   build: test
   language: c
   src:
   - test/core/support/slice_test.c
   deps:
-  - gpr_test_util
-  - gpr
+  - grpc_test_util
+  - grpc
 - name: gpr_stack_lockfree_test
   cpu_cost: 10
   build: test
@@ -1219,16 +1151,16 @@ targets:
   src:
   - test/core/support/stack_lockfree_test.c
   deps:
-  - gpr_test_util
-  - gpr
+  - grpc_test_util
+  - grpc
 - name: gpr_string_test
   build: test
   language: c
   src:
   - test/core/support/string_test.c
   deps:
-  - gpr_test_util
-  - gpr
+  - grpc_test_util
+  - grpc
 - name: gpr_sync_test
   cpu_cost: 10
   build: test
@@ -1236,8 +1168,8 @@ targets:
   src:
   - test/core/support/sync_test.c
   deps:
-  - gpr_test_util
-  - gpr
+  - grpc_test_util
+  - grpc
 - name: gpr_thd_test
   cpu_cost: 10
   build: test
@@ -1245,32 +1177,32 @@ targets:
   src:
   - test/core/support/thd_test.c
   deps:
-  - gpr_test_util
-  - gpr
+  - grpc_test_util
+  - grpc
 - name: gpr_time_test
   build: test
   language: c
   src:
   - test/core/support/time_test.c
   deps:
-  - gpr_test_util
-  - gpr
+  - grpc_test_util
+  - grpc
 - name: gpr_tls_test
   build: test
   language: c
   src:
   - test/core/support/tls_test.c
   deps:
-  - gpr_test_util
-  - gpr
+  - grpc_test_util
+  - grpc
 - name: gpr_useful_test
   build: test
   language: c
   src:
   - test/core/support/useful_test.c
   deps:
-  - gpr_test_util
-  - gpr
+  - grpc_test_util
+  - grpc
 - name: grpc_auth_context_test
   build: test
   language: c
@@ -1279,8 +1211,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
-  - gpr
 - name: grpc_base64_test
   build: test
   language: c
@@ -1289,8 +1219,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
-  - gpr
 - name: grpc_byte_buffer_reader_test
   build: test
   language: c
@@ -1299,8 +1227,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
-  - gpr
 - name: grpc_channel_args_test
   build: test
   language: c
@@ -1309,8 +1235,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
-  - gpr
 - name: grpc_channel_stack_test
   build: test
   language: c
@@ -1319,8 +1243,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
-  - gpr
 - name: grpc_completion_queue_test
   build: test
   language: c
@@ -1329,8 +1251,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
-  - gpr
 - name: grpc_create_jwt
   build: tool
   language: c
@@ -1339,8 +1259,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
-  - gpr
 - name: grpc_credentials_test
   build: test
   language: c
@@ -1349,8 +1267,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
-  - gpr
 - name: grpc_fetch_oauth2
   build: tool
   language: c
@@ -1359,8 +1275,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
-  - gpr
 - name: grpc_invalid_channel_args_test
   build: test
   language: c
@@ -1369,8 +1283,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
-  - gpr
 - name: grpc_json_token_test
   build: test
   language: c
@@ -1379,8 +1291,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
-  - gpr
   platforms:
   - linux
   - posix
@@ -1393,8 +1303,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
-  - gpr
 - name: grpc_print_google_default_creds_token
   build: tool
   language: c
@@ -1403,8 +1311,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
-  - gpr
 - name: grpc_security_connector_test
   build: test
   language: c
@@ -1413,8 +1319,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
-  - gpr
 - name: grpc_verify_jwt
   build: tool
   language: c
@@ -1423,8 +1327,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
-  - gpr
 - name: hpack_parser_test
   build: test
   language: c
@@ -1433,8 +1335,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
-  - gpr
 - name: hpack_table_test
   build: test
   language: c
@@ -1443,8 +1343,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
-  - gpr
 - name: httpcli_format_request_test
   build: test
   language: c
@@ -1453,8 +1351,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
-  - gpr
 - name: httpcli_parser_test
   build: test
   language: c
@@ -1463,8 +1359,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
-  - gpr
 - name: httpcli_test
   cpu_cost: 0.5
   build: test
@@ -1474,8 +1368,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
-  - gpr
   platforms:
   - mac
   - linux
@@ -1489,8 +1381,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
-  - gpr
   platforms:
   - linux
 - name: init_test
@@ -1501,8 +1391,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
-  - gpr
 - name: invalid_call_argument_test
   build: test
   language: c
@@ -1511,8 +1399,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
-  - gpr
 - name: json_rewrite
   build: test
   run: false
@@ -1521,7 +1407,6 @@ targets:
   - test/core/json/json_rewrite.c
   deps:
   - grpc
-  - gpr
 - name: json_rewrite_test
   build: test
   language: c
@@ -1530,8 +1415,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
-  - gpr
 - name: json_stream_error_test
   build: test
   language: c
@@ -1540,8 +1423,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
-  - gpr
 - name: json_test
   build: test
   language: c
@@ -1550,8 +1431,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
-  - gpr
 - name: lame_client_test
   build: test
   language: c
@@ -1560,8 +1439,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
-  - gpr
 - name: lb_policies_test
   cpu_cost: 0.1
   build: test
@@ -1571,8 +1448,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
-  - gpr
 - name: low_level_ping_pong_benchmark
   build: benchmark
   language: c
@@ -1581,8 +1456,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
-  - gpr
   platforms:
   - mac
   - linux
@@ -1595,8 +1468,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
-  - gpr
 - name: multiple_server_queues_test
   build: test
   language: c
@@ -1605,16 +1476,14 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
-  - gpr
 - name: murmur_hash_test
   build: test
   language: c
   src:
   - test/core/support/murmur_hash_test.c
   deps:
-  - gpr_test_util
-  - gpr
+  - grpc_test_util
+  - grpc
 - name: no_server_test
   cpu_cost: 0.1
   build: test
@@ -1624,8 +1493,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
-  - gpr
 - name: resolve_address_test
   build: test
   language: c
@@ -1634,8 +1501,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
-  - gpr
 - name: secure_channel_create_test
   build: test
   language: c
@@ -1644,8 +1509,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
-  - gpr
 - name: secure_endpoint_test
   build: test
   language: c
@@ -1654,8 +1517,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
-  - gpr
 - name: server_chttp2_test
   build: test
   language: c
@@ -1664,8 +1525,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
-  - gpr
 - name: server_test
   build: test
   language: c
@@ -1674,8 +1533,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
-  - gpr
 - name: set_initial_connect_string_test
   cpu_cost: 0.1
   build: test
@@ -1686,8 +1543,6 @@ targets:
   - test_tcp_server
   - grpc_test_util
   - grpc
-  - gpr_test_util
-  - gpr
 - name: sockaddr_resolver_test
   build: test
   language: c
@@ -1696,8 +1551,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
-  - gpr
 - name: sockaddr_utils_test
   build: test
   language: c
@@ -1706,8 +1559,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
-  - gpr
 - name: socket_utils_test
   build: test
   language: c
@@ -1716,8 +1567,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
-  - gpr
   platforms:
   - mac
   - linux
@@ -1731,8 +1580,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
-  - gpr
   platforms:
   - mac
   - linux
@@ -1746,8 +1593,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
-  - gpr
   platforms:
   - mac
   - linux
@@ -1760,8 +1605,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
-  - gpr
   platforms:
   - mac
   - linux
@@ -1774,8 +1617,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
-  - gpr
 - name: timeout_encoding_test
   build: test
   language: c
@@ -1784,8 +1625,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
-  - gpr
 - name: timer_heap_test
   build: test
   language: c
@@ -1794,8 +1633,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
-  - gpr
 - name: timer_list_test
   build: test
   language: c
@@ -1804,8 +1641,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
-  - gpr
 - name: timers_test
   build: test
   language: c
@@ -1814,8 +1649,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
-  - gpr
 - name: transport_connectivity_state_test
   build: test
   language: c
@@ -1824,8 +1657,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
-  - gpr
 - name: transport_metadata_test
   build: test
   language: c
@@ -1834,8 +1665,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
-  - gpr
 - name: transport_security_test
   build: test
   language: c
@@ -1844,8 +1673,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
-  - gpr
   platforms:
   - linux
   - posix
@@ -1858,8 +1685,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
-  - gpr
   platforms:
   - mac
   - linux
@@ -1872,8 +1697,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
-  - gpr
 - name: workqueue_test
   build: test
   language: c
@@ -1882,8 +1705,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
-  - gpr
   platforms:
   - mac
   - linux
@@ -1898,8 +1719,6 @@ targets:
   - grpc_test_util
   - grpc++
   - grpc
-  - gpr_test_util
-  - gpr
 - name: async_streaming_ping_pong_test
   build: test
   language: c++
@@ -1911,8 +1730,6 @@ targets:
   - grpc_test_util
   - grpc++
   - grpc
-  - gpr_test_util
-  - gpr
   platforms:
   - mac
   - linux
@@ -1928,8 +1745,6 @@ targets:
   - grpc_test_util
   - grpc++
   - grpc
-  - gpr_test_util
-  - gpr
   platforms:
   - mac
   - linux
@@ -1944,8 +1759,6 @@ targets:
   - grpc_test_util
   - grpc++
   - grpc
-  - gpr_test_util
-  - gpr
 - name: channel_arguments_test
   build: test
   language: c++
@@ -1954,7 +1767,6 @@ targets:
   deps:
   - grpc++
   - grpc
-  - gpr
 - name: cli_call_test
   build: test
   language: c++
@@ -1965,8 +1777,6 @@ targets:
   - grpc_test_util
   - grpc++
   - grpc
-  - gpr_test_util
-  - gpr
 - name: client_crash_test
   cpu_cost: 0.1
   build: test
@@ -1978,8 +1788,6 @@ targets:
   - grpc_test_util
   - grpc++
   - grpc
-  - gpr_test_util
-  - gpr
   platforms:
   - mac
   - linux
@@ -1995,8 +1803,6 @@ targets:
   - grpc_test_util
   - grpc++
   - grpc
-  - gpr_test_util
-  - gpr
 - name: credentials_test
   build: test
   language: c++
@@ -2005,7 +1811,6 @@ targets:
   deps:
   - grpc++
   - grpc
-  - gpr
 - name: cxx_byte_buffer_test
   build: test
   language: c++
@@ -2015,8 +1820,6 @@ targets:
   - grpc_test_util
   - grpc++
   - grpc
-  - gpr_test_util
-  - gpr
 - name: cxx_slice_test
   build: test
   language: c++
@@ -2026,8 +1829,6 @@ targets:
   - grpc_test_util
   - grpc++
   - grpc
-  - gpr_test_util
-  - gpr
 - name: cxx_string_ref_test
   build: test
   language: c++
@@ -2044,8 +1845,6 @@ targets:
   - grpc_test_util
   - grpc++
   - grpc
-  - gpr_test_util
-  - gpr
 - name: end2end_test
   cpu_cost: 0.5
   build: test
@@ -2057,8 +1856,6 @@ targets:
   - grpc_test_util
   - grpc++
   - grpc
-  - gpr_test_util
-  - gpr
 - name: generic_async_streaming_ping_pong_test
   build: test
   language: c++
@@ -2070,8 +1867,6 @@ targets:
   - grpc_test_util
   - grpc++
   - grpc
-  - gpr_test_util
-  - gpr
   platforms:
   - mac
   - linux
@@ -2086,8 +1881,6 @@ targets:
   - grpc_test_util
   - grpc++
   - grpc
-  - gpr_test_util
-  - gpr
 - name: grpc_cli
   build: test
   run: false
@@ -2099,8 +1892,6 @@ targets:
   - grpc_test_util
   - grpc++
   - grpc
-  - gpr_test_util
-  - gpr
   - grpc++_test_config
 - name: grpc_cpp_plugin
   build: protoc
@@ -2162,8 +1953,6 @@ targets:
   - grpc_test_util
   - grpc++
   - grpc
-  - gpr_test_util
-  - gpr
 - name: interop_client
   build: test
   run: false
@@ -2176,8 +1965,6 @@ targets:
   - grpc_test_util
   - grpc++
   - grpc
-  - gpr_test_util
-  - gpr
   - grpc++_test_config
   platforms:
   - mac
@@ -2195,8 +1982,6 @@ targets:
   - grpc_test_util
   - grpc++
   - grpc
-  - gpr_test_util
-  - gpr
   - grpc++_test_config
   platforms:
   - mac
@@ -2211,8 +1996,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
-  - gpr
   platforms:
   - mac
   - linux
@@ -2229,7 +2012,6 @@ targets:
   deps:
   - grpc++
   - grpc
-  - gpr
   - grpc++_test_config
 - name: mock_test
   build: test
@@ -2241,8 +2023,6 @@ targets:
   - grpc_test_util
   - grpc++
   - grpc
-  - gpr_test_util
-  - gpr
 - name: qps_driver
   build: benchmark
   language: c++
@@ -2254,8 +2034,6 @@ targets:
   - grpc_test_util
   - grpc++
   - grpc
-  - gpr_test_util
-  - gpr
   - grpc++_test_config
 - name: qps_interarrival_test
   build: test
@@ -2269,8 +2047,6 @@ targets:
   - grpc_test_util
   - grpc++
   - grpc
-  - gpr_test_util
-  - gpr
   platforms:
   - mac
   - linux
@@ -2287,8 +2063,6 @@ targets:
   - grpc_test_util
   - grpc++
   - grpc
-  - gpr_test_util
-  - gpr
   - grpc++_test_config
   platforms:
   - mac
@@ -2306,8 +2080,6 @@ targets:
   - grpc_test_util
   - grpc++
   - grpc
-  - gpr_test_util
-  - gpr
   - grpc++_test_config
   exclude_configs:
   - tsan
@@ -2329,8 +2101,6 @@ targets:
   - grpc_test_util
   - grpc++
   - grpc
-  - gpr_test_util
-  - gpr
   - grpc++_test_config
 - name: reconnect_interop_client
   build: test
@@ -2346,8 +2116,6 @@ targets:
   - grpc_test_util
   - grpc++
   - grpc
-  - gpr_test_util
-  - gpr
   - grpc++_test_config
 - name: reconnect_interop_server
   build: test
@@ -2365,8 +2133,6 @@ targets:
   - grpc_test_util
   - grpc++
   - grpc
-  - gpr_test_util
-  - gpr
   - grpc++_test_config
 - name: secure_auth_context_test
   build: test
@@ -2378,8 +2144,6 @@ targets:
   - grpc_test_util
   - grpc++
   - grpc
-  - gpr_test_util
-  - gpr
 - name: secure_sync_unary_ping_pong_test
   build: test
   language: c++
@@ -2391,8 +2155,6 @@ targets:
   - grpc_test_util
   - grpc++
   - grpc
-  - gpr_test_util
-  - gpr
   platforms:
   - mac
   - linux
@@ -2408,8 +2170,6 @@ targets:
   - grpc_test_util
   - grpc++
   - grpc
-  - gpr_test_util
-  - gpr
   platforms:
   - mac
   - linux
@@ -2425,8 +2185,6 @@ targets:
   - grpc_test_util
   - grpc++
   - grpc
-  - gpr_test_util
-  - gpr
 - name: shutdown_test
   build: test
   language: c++
@@ -2437,8 +2195,6 @@ targets:
   - grpc_test_util
   - grpc++
   - grpc
-  - gpr_test_util
-  - gpr
 - name: status_test
   build: test
   language: c++
@@ -2448,8 +2204,6 @@ targets:
   - grpc_test_util
   - grpc++
   - grpc
-  - gpr_test_util
-  - gpr
 - name: streaming_throughput_test
   build: test
   language: c++
@@ -2460,8 +2214,6 @@ targets:
   - grpc_test_util
   - grpc++
   - grpc
-  - gpr_test_util
-  - gpr
   platforms:
   - mac
   - linux
@@ -2489,8 +2241,6 @@ targets:
   - grpc_test_util
   - grpc++
   - grpc
-  - gpr_test_util
-  - gpr
   - grpc++_test_config
 - name: sync_streaming_ping_pong_test
   build: test
@@ -2503,8 +2253,6 @@ targets:
   - grpc_test_util
   - grpc++
   - grpc
-  - gpr_test_util
-  - gpr
   platforms:
   - mac
   - linux
@@ -2520,8 +2268,6 @@ targets:
   - grpc_test_util
   - grpc++
   - grpc
-  - gpr_test_util
-  - gpr
   platforms:
   - mac
   - linux
@@ -2537,8 +2283,6 @@ targets:
   - grpc_test_util
   - grpc++
   - grpc
-  - gpr_test_util
-  - gpr
 - name: zookeeper_test
   build: test
   run: false
@@ -2552,8 +2296,6 @@ targets:
   - grpc++
   - grpc_zookeeper
   - grpc
-  - gpr_test_util
-  - gpr
   external_deps:
   - zookeeper
   platforms:
@@ -2565,7 +2307,6 @@ targets:
   - test/core/surface/public_headers_must_be_c89.c
   deps:
   - grpc
-  - gpr
 vspackages:
 - linkage: static
   name: grpc.dependencies.zlib
@@ -2589,6 +2330,7 @@ configs:
   asan:
     CC: clang
     CPPFLAGS: -O0 -fsanitize=address -fno-omit-frame-pointer -Wno-unused-command-line-argument
+      -DGPR_NO_DIRECT_SYSCALLS
     CXX: clang++
     LD: clang
     LDFLAGS: -fsanitize=address
@@ -2601,6 +2343,7 @@ configs:
   asan-noleaks:
     CC: clang
     CPPFLAGS: -O0 -fsanitize=address -fno-omit-frame-pointer -Wno-unused-command-line-argument
+      -DGPR_NO_DIRECT_SYSCALLS
     CXX: clang++
     LD: clang
     LDFLAGS: -fsanitize=address
@@ -2615,7 +2358,6 @@ configs:
   dbg:
     CPPFLAGS: -O0
     DEFINES: _DEBUG DEBUG
-    LDFLAGS: -rdynamic
   gcov:
     CC: gcc
     CPPFLAGS: -O0 -fprofile-arcs -ftest-coverage -Wno-return-type
@@ -2640,7 +2382,7 @@ configs:
     CC: clang
     CPPFLAGS: -O0 -fsanitize=memory -fsanitize-memory-track-origins -fno-omit-frame-pointer
       -DGTEST_HAS_TR1_TUPLE=0 -DGTEST_USE_OWN_TR1_TUPLE=1 -Wno-unused-command-line-argument
-      -fPIE -pie
+      -fPIE -pie -DGPR_NO_DIRECT_SYSCALLS
     CXX: clang++
     DEFINES: NDEBUG
     LD: clang
@@ -2656,14 +2398,13 @@ configs:
   opt:
     CPPFLAGS: -O2
     DEFINES: NDEBUG
-    LDFLAGS: -rdynamic
   stapprof:
     CPPFLAGS: -O2 -DGRPC_STAP_PROFILER
     DEFINES: NDEBUG
   tsan:
     CC: clang
     CPPFLAGS: -O0 -fsanitize=thread -fno-omit-frame-pointer -Wno-unused-command-line-argument
-      -fPIE -pie
+      -fPIE -pie -DGPR_NO_DIRECT_SYSCALLS
     CXX: clang++
     LD: clang
     LDFLAGS: -fsanitize=thread -fPIE -pie $(if $(JENKINS_BUILD),-Wl$(comma)-Ttext-segment=0x7e0000000000,)
@@ -2684,9 +2425,10 @@ configs:
     timeout_multiplier: 1.5
 defaults:
   boringssl:
-    CFLAGS: -Wno-sign-conversion -Wno-conversion -Wno-unused-value
+    CFLAGS: -Wno-sign-conversion -Wno-conversion -Wno-unused-value -Wno-unknown-pragmas
+      -Wno-implicit-function-declaration -Wno-unused-variable -Wno-sign-compare
     CPPFLAGS: -Ithird_party/boringssl/include -fvisibility=hidden -DOPENSSL_NO_ASM
-      -D_GNU_SOURCE
+      -D_GNU_SOURCE -DWIN32_LEAN_AND_MEAN -D_HAS_EXCEPTIONS=0 -DNOMINMAX
   global:
     CPPFLAGS: -g -Wall -Wextra -Werror -Wno-long-long -Wno-unused-parameter
     LDFLAGS: -g
@@ -2696,7 +2438,6 @@ defaults:
 node_modules:
 - deps:
   - grpc
-  - gpr
   - boringssl
   - z
   headers:
@@ -2731,6 +2472,10 @@ node_modules:
 python_dependencies:
   deps:
   - grpc
-  - gpr
+  - boringssl
+  - z
+ruby_gem:
+  deps:
+  - grpc
   - boringssl
   - z