Merge branch 'node_electron_build' of github.com:murgatroid99/grpc into node_electron_build

binding.gyp

@@ -54,14 +54,18 @@
           'GRPC_UV'
         ]
       }],
+      ['runtime=="electron"', {
+        "defines": [
+          'OPENSSL_NO_THREADS'
+        ]
+      }],
       # This is the condition for using boringssl
       ['OS=="win" or runtime=="electron"', {
         "include_dirs": [
           "third_party/boringssl/include"
         ],
         "defines": [
-          'OPENSSL_NO_ASM',
-          'OPENSSL_NO_THREADS'
+          'OPENSSL_NO_ASM'
         ]
       }, {
         # Based on logic above, we know that this must be a non-Windows system

templates/binding.gyp.template

@@ -56,14 +56,18 @@
             'GRPC_UV'
           ]
         }],
+        ['runtime=="electron"', {
+          "defines": [
+            'OPENSSL_NO_THREADS'
+          ]
+        }],
         # This is the condition for using boringssl
         ['OS=="win" or runtime=="electron"', {
           "include_dirs": [
             "third_party/boringssl/include"
           ],
           "defines": [
-            'OPENSSL_NO_ASM',
-            'OPENSSL_NO_THREADS'
+            'OPENSSL_NO_ASM'
           ]
         }, {
           # Based on logic above, we know that this must be a non-Windows system