android envsetup: Stop honoring --target-arch parameter.

build/android/buildbot/bb_run_bot.py

 #!/usr/bin/env python
 #
 # Copyright (c) 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.
 
 import collections
 import copy
 import json
 import os
@@ skipping 33 matching lines @@
       diff.append('+ %s=%s' % (key, pipes.quote(d2[key])))
   return '\n'.join(diff)
 
 
 def GetEnvironment(host_obj, testing, extra_env_vars=None):
   init_env = dict(os.environ)
   init_env['GYP_GENERATORS'] = 'ninja'
   if extra_env_vars:
     init_env.update(extra_env_vars)
   envsetup_cmd = '. build/android/envsetup.sh'
-  if host_obj.target_arch:
-    envsetup_cmd += ' --target-arch=%s' % host_obj.target_arch
   if testing:
     # Skip envsetup to avoid presubmit dependence on android deps.
     print 'Testing mode - skipping "%s"' % envsetup_cmd
     envsetup_cmd = ':'
   else:
     print 'Running %s' % envsetup_cmd
   proc = subprocess.Popen(['bash', '-exc',
     envsetup_cmd + ' >&2; python build/android/buildbot/env_to_json.py'],
     stdout=subprocess.PIPE, stderr=subprocess.PIPE,
     cwd=bb_utils.CHROME_SRC, env=init_env)
   json_env, envsetup_output = proc.communicate()
   if proc.returncode != 0:
     print >> sys.stderr, 'FATAL Failure in envsetup.'
     print >> sys.stderr, envsetup_output
     sys.exit(1)
   env = json.loads(json_env)
   env['GYP_DEFINES'] = env.get('GYP_DEFINES', '') + \
       ' fastbuild=1 use_goma=1 gomadir=%s' % bb_utils.GOMA_DIR
+  if host_obj.target_arch:
+    gyp_target_arch = { 'mips': 'mipsel', 'x86': 'ia32' }.get(
+        host_obj.target_arch, host_obj.target_arch)
+    env['GYP_DEFINES'] += ' target_arch=%s' % gyp_target_arch
   extra_gyp = host_obj.extra_gyp_defines
   if extra_gyp:
     env['GYP_DEFINES'] += ' %s' % extra_gyp
     if re.search('(asan|clang)=1', extra_gyp):
       env.pop('CXX_target', None)
 
   # Bots checkout chrome in /b/build/slave/<name>/build/src
   build_internal_android = os.path.abspath(os.path.join(
       bb_utils.CHROME_SRC, '..', '..', '..', '..', '..', 'build_internal',
       'scripts', 'slave', 'android'))
@@ skipping 200 matching lines @@
   for command in commands:
     print 'Will run: ', bb_utils.CommandToString(command)
   print
 
   env = GetEnvironment(bot_config.host_obj, options.testing)
   return RunBotCommands(options, commands, env)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))