Merge branch 'master' of github.com:grpc/grpc into authority_header

1 files changed, 11 insertions, 0 deletions

diff --git a/grpc.gyp b/grpc.gyp
index 5e112fafec..30664695b3 100644
--- a/grpc.gyp
+++ b/grpc.gyp
@@ -157,6 +157,17 @@
   },
   'targets': [
     {
+      'target_name': 'address_sorting',
+      'type': 'static_library',
+      'dependencies': [
+      ],
+      'sources': [
+        'third_party/address_sorting/address_sorting.c',
+        'third_party/address_sorting/address_sorting_posix.c',
+        'third_party/address_sorting/address_sorting_windows.c',
+      ],
+    },
+    {
       'target_name': 'alts_test_util',
       'type': 'static_library',
       'dependencies': [