aboutsummaryrefslogtreecommitdiffhomepage
path: root/binding.gyp
diff options
context:
space:
mode:
authorGravatar Mark D. Roth <roth@google.com>2017-10-12 09:13:15 -0700
committerGravatar Mark D. Roth <roth@google.com>2017-10-12 09:13:15 -0700
commit0e8cad5bba5277d28024b4618067293afd13e92f (patch)
tree290afe596661b2201f2820f38e65feec2f1f277f /binding.gyp
parent9843ec78a72cced1b304487c8eface166c6fc0a6 (diff)
parentd7b198be47b5723bc198d25c5ce56f82e12fa97f (diff)
Merge remote-tracking branch 'upstream/master' into pick_first_subchannel_list
Diffstat (limited to 'binding.gyp')
-rw-r--r--binding.gyp2
1 files changed, 1 insertions, 1 deletions
diff --git a/binding.gyp b/binding.gyp
index 08c7a2ceef..f1f1b46fb0 100644
--- a/binding.gyp
+++ b/binding.gyp
@@ -600,7 +600,6 @@
'src/core/lib/support/arena.cc',
'src/core/lib/support/atm.cc',
'src/core/lib/support/avl.cc',
- 'src/core/lib/support/backoff.cc',
'src/core/lib/support/cmdline.cc',
'src/core/lib/support/cpu_iphone.cc',
'src/core/lib/support/cpu_linux.cc',
@@ -658,6 +657,7 @@
],
'sources': [
'src/core/lib/surface/init.cc',
+ 'src/core/lib/backoff/backoff.cc',
'src/core/lib/channel/channel_args.cc',
'src/core/lib/channel/channel_stack.cc',
'src/core/lib/channel/channel_stack_builder.cc',