diff options
| author |  Mark D. Roth <roth@google.com> | 2018-04-10 14:02:26 -0700 |
|---|---|---|
| committer | Mark D. Roth <roth@google.com> | 2018-04-10 14:02:26 -0700 |
| commit | a63aa993e0f9b95176f83d52bc8220ba013f4338 (patch) | |
| tree | 2d98aa0c9129275ac23d064d86edbce3a58f7383 /grpc.gyp | |
| parent | 99dbd7a975704135b0b4d20c43c57c6af90b7485 (diff) | |
| parent | ee6e4dc784cf63bc53e4b19609c6f458fd4b535c (diff) | |
Merge remote-tracking branch 'upstream/master' into c++_subchannel_list
Diffstat (limited to 'grpc.gyp')
| -rw-r--r-- | grpc.gyp | 2 |
1 files changed, 0 insertions, 2 deletions
@@ -1340,7 +1340,6 @@ 'src/cpp/server/server_posix.cc', 'src/cpp/thread_manager/thread_manager.cc', 'src/cpp/util/byte_buffer_cc.cc', - 'src/cpp/util/slice_cc.cc', 'src/cpp/util/status.cc', 'src/cpp/util/string_ref.cc', 'src/cpp/util/time_cc.cc', @@ -1488,7 +1487,6 @@ 'src/cpp/server/server_posix.cc', 'src/cpp/thread_manager/thread_manager.cc', 'src/cpp/util/byte_buffer_cc.cc', - 'src/cpp/util/slice_cc.cc', 'src/cpp/util/status.cc', 'src/cpp/util/string_ref.cc', 'src/cpp/util/time_cc.cc', |