Make gyp target_arch setting native to chromium/config.py

scripts/slave/recipe_modules/chromium_android/api.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 import recipe_api
 
 class AndroidApi(recipe_api.RecipeApi):
   def __init__(self, **kwargs):
     super(AndroidApi, self).__init__(**kwargs)
     self._env = dict()
@@ skipping 86 matching lines @@
       yield self.m.step(
           'get_internal_names',
           [self.c.internal_dir('build', 'dump_internal_names.py'),
            '--output-json', self.m.json.output()]
       )
 
       self._internal_names = self.m.step_history.last_step().json.output
 
   def envsetup(self):
     envsetup_cmd = [self.m.path.checkout('build', 'android', 'envsetup.sh')]
-    if self.c.target_arch:
-      envsetup_cmd += ['--target-arch=%s' % self.c.target_arch]
+    if self.target_arch:
+      envsetup_cmd += ['--target-arch=%s' % self.target_arch]
 
     cmd = ([self.m.path.build('scripts', 'slave', 'env_dump.py'),
             '--output-json', self.m.json.output()] + envsetup_cmd)
     yield self.m.step('envsetup', cmd, env=self.get_env())
 
     env_diff = self.m.step_history.last_step().json.output
     for key, value in env_diff.iteritems():
       if key.startswith('GYP_'):
         continue
       else:
@@ skipping 184 matching lines @@
       yield self.m.step(
           'stack_tool_for_tombstones',
           [self.m.path.checkout('build', 'android', 'tombstones.py'),
            '-a', '-s', '-w'], always_run=True, env=self.get_env())
       if self.c.asan_symbolize:
         yield self.m.step(
             'stack_tool_for_asan',
             [self.m.path.checkout('build', 'android', 'asan_symbolize.py'),
              '-l', log_file], always_run=True, env=self.get_env())
 
+  @property
+  def target_arch(self):
+    """Convert from recipe arch to android arch."""
+    return {
+      'intel': 'x86',
+      'arm':   'arm',
+      'mips':  'mips',
+    }.get(self.m.chromium.c.TARGET_ARCH, '')
+
   def test_report(self):
     return self.m.python.inline(
         'test_report',
          """
             import glob, os, sys
             for report in glob.glob(sys.argv[1]):
               with open(report, 'r') as f:
                 for l in f.readlines():
                   print l
               os.remove(report)
          """,
          args=[self.m.path.checkout('out', self.m.chromium.c.BUILD_CONFIG,
                                     'test_logs', '*.log')],
          always_run=True
     )
 
   def cleanup_build(self):
     return self.m.step(
         'cleanup_build',
         ['rm', '-rf'] + self._cleanup_list,
         always_run=True)
 
   def common_tree_setup_steps(self):
     yield self.init_and_sync()
     yield self.envsetup()
     yield self.clean_local_files()
     if self.c.INTERNAL and self.c.run_tree_truth:
       yield self.run_tree_truth()
-    
+
   def common_tests_setup_steps(self):
     yield self.spawn_logcat_monitor()
     yield self.detect_and_setup_devices()
 
   def common_tests_final_steps(self):
     yield self.logcat_dump()
     yield self.stack_tool_steps()
     yield self.test_report()
     yield self.cleanup_build()