Fixing sdk gyp_vars mishandled in buildbot script.

native_client_sdk/src/build_tools/buildbot_common.py

Index: native_client_sdk/src/build_tools/buildbot_common.py
diff --git a/native_client_sdk/src/build_tools/buildbot_common.py b/native_client_sdk/src/build_tools/buildbot_common.py
index 2799fb4c25ac6bf25e9b5aac5f76bd6613d0ce16..7fad468c97a51e838a8d3543f0b4c36ebc7f168b 100644
--- a/native_client_sdk/src/build_tools/buildbot_common.py
+++ b/native_client_sdk/src/build_tools/buildbot_common.py
@@ -71,6 +71,9 @@ def GetWindowsEnvironment():
       return self.env[key]
 
     def __getitem__(self, key):
+      # The nacl side script now needs gyp_vars to return a list.
+      if key == 'gyp_vars':
+        return []
       return self.env[key]
 
     def SetEnv(self, key, value):
@@ -80,7 +83,6 @@ def GetWindowsEnvironment():
       self.env[key] = value
 
   context = FakeContext()
-  context['gyp_vars'] = []
   buildbot_standard.SetupWindowsEnvironment(context)
 
   # buildbot_standard.SetupWindowsEnvironment adds the directory which contains
@@ -97,7 +99,7 @@ def GetWindowsEnvironment():
   # KEY1=VALUE1\r\n
   # KEY2=VALUE2\r\n
   # ...
-  return dict(line.split('=') for line in stdout.split('\r\n')[:-1])
+  return dict(line.split('=', 1) for line in stdout.split('\r\n')[:-1])
 
 
 def BuildStep(name):