[chromium_android recipes] Cleanup envsetup step and cleanup step names.

scripts/slave/recipe_modules/chromium/config.py

 # Copyright 2013 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.
 
 from slave.recipe_configs_util import config_item_context, ConfigGroup
 from slave.recipe_configs_util import Dict, Single, Static, Set, BadConf
 
 # Because of the way that we use decorators, pylint can't figure out the proper
 # type signature of functions annotated with the @config_ctx decorator.
 # pylint: disable=E1123
@@ skipping 14 matching lines @@
                TARGET_PLATFORM, TARGET_ARCH, TARGET_BITS,
                BUILD_CONFIG, **_kwargs):
   equal_fn = lambda tup: ('%s=%s' % tup)
   return ConfigGroup(
     compile_py = ConfigGroup(
       default_targets = Set(basestring),
       build_tool = Single(basestring),
       compiler = Single(basestring, required=False),
     ),
     gyp_env = ConfigGroup(
-      GYP_DEFINES = Dict(equal_fn, ' '.join, (basestring,int)),
+      GYP_CROSSCOMPILE = Single(int, required=False),
+      GYP_DEFINES = Dict(equal_fn, ' '.join, (basestring,int,list)),
       GYP_GENERATORS = Set(basestring, ','.join),
       GYP_GENERATOR_FLAGS = Dict(equal_fn, ' '.join, (basestring,int)),
       GYP_MSVS_VERSION = Single(basestring, required=False),
     ),
     build_dir = Single(basestring),
 
     # Some platforms do not have a 1:1 correlation of BUILD_CONFIG to what is
     # passed as --target on the command line.
     build_config_fs = Single(basestring),
 
@@ skipping 163 matching lines @@
 @config_ctx(includes=['ninja', 'default_compiler', 'goma'])
 def chromium(c):
   c.compile_py.default_targets = ['All', 'chromium_builder_tests']
 
 @config_ctx(includes=['chromium'])
 def blink(c):
   c.compile_py.default_targets = ['all_webkit']
   if c.TARGET_PLATFORM == 'win':
     c.gyp_env.GYP_DEFINES['use_ash'] = 0
     c.gyp_env.GYP_DEFINES['use_aura'] = 0