Merge branch 'master' into gpr_review
diff --git a/BUILD b/BUILD
index 4f1785d..398a3f4 100644
--- a/BUILD
+++ b/BUILD
@@ -68,7 +68,6 @@
"include/grpc/support/atm_windows.h",
"include/grpc/support/cmdline.h",
"include/grpc/support/cpu.h",
- "include/grpc/support/host_port.h",
"include/grpc/support/log.h",
"include/grpc/support/log_windows.h",
"include/grpc/support/port_platform.h",
@@ -91,7 +90,6 @@
"include/grpc/byte_buffer.h",
"include/grpc/byte_buffer_reader.h",
"include/grpc/compression.h",
- "include/grpc/compression_ruby.h",
"include/grpc/fork.h",
"include/grpc/grpc.h",
"include/grpc/grpc_posix.h",
@@ -451,8 +449,6 @@
grpc_cc_library(
name = "gpr_base",
srcs = [
- "src/core/lib/profiling/basic_timers.cc",
- "src/core/lib/profiling/stap_timers.cc",
"src/core/lib/gpr/alloc.cc",
"src/core/lib/gpr/arena.cc",
"src/core/lib/gpr/atm.cc",
@@ -494,13 +490,14 @@
"src/core/lib/gpr/tmpfile_posix.cc",
"src/core/lib/gpr/tmpfile_windows.cc",
"src/core/lib/gpr/wrap_memcpy.cc",
+ "src/core/lib/profiling/basic_timers.cc",
+ "src/core/lib/profiling/stap_timers.cc",
],
hdrs = [
- "src/core/lib/profiling/timers.h",
"src/core/lib/gpr/arena.h",
"src/core/lib/gpr/env.h",
"src/core/lib/gpr/fork.h",
- "src/core/lib/gpr/useful.h",
+ "src/core/lib/gpr/host_port.h",
"src/core/lib/gpr/mpscq.h",
"src/core/lib/gpr/murmur_hash.h",
"src/core/lib/gpr/spinlock.h",
@@ -509,6 +506,8 @@
"src/core/lib/gpr/thd_internal.h",
"src/core/lib/gpr/time_precise.h",
"src/core/lib/gpr/tmpfile.h",
+ "src/core/lib/gpr/useful.h",
+ "src/core/lib/profiling/timers.h",
],
language = "c++",
public_hdrs = GPR_PUBLIC_HDRS,
@@ -561,14 +560,14 @@
grpc_cc_library(
name = "atomic",
- language = "c++",
- public_hdrs = [
- "src/core/lib/gprpp/atomic.h",
- ],
hdrs = [
"src/core/lib/gprpp/atomic_with_atm.h",
"src/core/lib/gprpp/atomic_with_std.h",
],
+ language = "c++",
+ public_hdrs = [
+ "src/core/lib/gprpp/atomic.h",
+ ],
deps = [
"gpr",
],
@@ -599,6 +598,7 @@
"debug_location",
"gpr++_base",
"grpc_trace",
+ "ref_counted_ptr",
],
)
@@ -610,6 +610,7 @@
"debug_location",
"gpr++_base",
"grpc_trace",
+ "ref_counted_ptr",
],
)
@@ -636,7 +637,6 @@
"src/core/lib/channel/handshaker_registry.cc",
"src/core/lib/compression/compression.cc",
"src/core/lib/compression/compression_internal.cc",
- "src/core/lib/compression/compression_ruby.cc",
"src/core/lib/compression/message_compress.cc",
"src/core/lib/compression/stream_compression.cc",
"src/core/lib/compression/stream_compression_gzip.cc",
@@ -888,8 +888,8 @@
language = "c++",
public_hdrs = GRPC_PUBLIC_HDRS,
deps = [
- "gpr_base",
"gpr++_base",
+ "gpr_base",
"grpc_codegen",
"grpc_trace",
],