ios: Allow bot configs to set extra env variables

scripts/slave/recipe_modules/ios/api.py

 # Copyright 2015 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import copy
 
 from slave import recipe_api
 
 
 class iOSApi(recipe_api.RecipeApi):
@@ skipping 105 matching lines @@
         'configuration',
         'sdk',
       ):
         self.__config[key] = parent_config[key]
 
     # We set some default GYP_DEFINES so developers don't have to set them
     # manually on every bot. Add them in here.
     self.__config['GYP_DEFINES']['component'] = 'static_library'
     self.__config['GYP_DEFINES']['OS'] = 'ios'
 
-    # Because build configs are only required to specify "triggered bots" or
-    # "tests", one of them may not be specified. In order to simplify the code
-    # that uses the values of self.__config, here we default them both to empty
-    # values of their respective types, so in other places we can iterate over
-    # them without having to check if they are in the dict at all.
+    # In order to simplify the code that uses the values of self.__config, here
+    # we default to empty values of their respective types, so in other places
+    # we can iterate over them without having to check if they are in the dict
+    # at all.
     self.__config['triggered bots'] = self.__config.get('triggered bots', {})
     self.__config['tests'] = self.__config.get('tests', [])
+    self.__config['env'] = self.__config.get('env', {})
 
     # Elements of the "tests" list are dicts. There are two types of elements,
     # determined by the presence of one of these mutually exclusive keys:
     #   "app": This says to run a particular app.
     #   "include": This says to include a common set of tests from include_dir.
     # So now we go through the "tests" list replacing any "include" keys.
     # The value of an "include" key is the name of a set of tests to include,
     # which can be found as a .json file in include_dir. Read the contents
     # lazily as needed into includes.
     def read_include(includes):
@@ skipping 74 matching lines @@
     # Add the default GYP_DEFINES.
     gyp_defines = [
       '%s=%s' % (k, v) for k, v in self.__config['GYP_DEFINES'].iteritems()
     ]
 
     env = {
       'GYP_DEFINES': ' '.join(gyp_defines),
       'LANDMINES_VERBOSE': '1',
     }
 
+    # Add extra env variables.
+    env.update(self.__config['env'])
+
     if self.compiler == 'xcodebuild':
       env['GYP_GENERATORS'] = 'xcode'
       env['GYP_GENERATOR_FLAGS'] = 'xcode_project_version=3.2'
       cwd = self.m.path['checkout'].join('xcodebuild')
       cmd = [
         'xcodebuild',
         '-configuration', self.configuration,
         '-project', self.m.path['checkout'].join(
           'build',
           'all.xcodeproj',
@@ skipping 189 matching lines @@
         self.configuration,
         'iossim',
       ),
       'ninja': self.m.path.join(
         'src',
          build_dir,
          '%s-%s' % (self.configuration, platform),
          'iossim',
       ),
     }[self.compiler]