Make gyp target_arch setting native to chromium/config.py

scripts/slave/recipe_modules/chromium_android/api.py

Index: scripts/slave/recipe_modules/chromium_android/api.py
diff --git a/scripts/slave/recipe_modules/chromium_android/api.py b/scripts/slave/recipe_modules/chromium_android/api.py
index 16fba490903f595007323221eb55d7d596e86cf7..222cdf112b9ff3597a69343c9b6cd3cd90d44ff7 100644
--- a/scripts/slave/recipe_modules/chromium_android/api.py
+++ b/scripts/slave/recipe_modules/chromium_android/api.py
@@ -102,8 +102,8 @@ class AndroidApi(recipe_api.RecipeApi):
 
   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.checkout('build', 'env_dump.py'),
             '--output-json', self.m.json.output()] + envsetup_cmd)
@@ -308,6 +308,15 @@ class AndroidApi(recipe_api.RecipeApi):
             [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',
@@ -336,7 +345,7 @@ class AndroidApi(recipe_api.RecipeApi):
     yield self.clean_local_files()
     if self.c.INTERNAL:
       yield self.run_tree_truth()
-    
+
   def common_tests_setup_steps(self):
     yield self.spawn_logcat_monitor()
     yield self.detect_and_setup_devices()