Add target_arch config variable to .isolate files.

build/android/pylib/gtest/setup.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.
 
 """Generates test runner factory and tests for GTests."""
 # pylint: disable=W0212
 
 import fnmatch
 import glob
 import logging
@@ skipping 120 matching lines @@
       '--outdir', constants.ISOLATE_DEPS_DIR,
 
       '--path-variable', 'DEPTH', constants.DIR_SOURCE_ROOT,
       '--path-variable', 'PRODUCT_DIR', constants.GetOutDirectory(),
 
       '--config-variable', 'OS', 'android',
       '--config-variable', 'CONFIGURATION_NAME', constants.GetBuildType(),
       '--config-variable', 'chromeos', '0',
       '--config-variable', 'component', 'static_library',
       '--config-variable', 'icu_use_data_file_flag', '1',
+      # TODO(maruel): This may not be always true.
+      '--config-variable', 'target_arch', 'arm',
       '--config-variable', 'use_openssl', '0',
   ]
   assert not cmd_helper.RunCmd(isolate_cmd)
 
   # We're relying on the fact that timestamps are preserved
   # by the remap command (hardlinked). Otherwise, all the data
   # will be pushed to the device once we move to using time diff
   # instead of md5sum. Perform a sanity check here.
   for root, _, filenames in os.walk(constants.ISOLATE_DEPS_DIR):
     if filenames:
@@ skipping 193 matching lines @@
   if test_options.gtest_filter:
     tests = unittest_util.FilterTestNames(tests, test_options.gtest_filter)
 
   # Coalesce unit tests into a single test per device
   if test_options.suite_name != 'content_browsertests':
     num_devices = len(devices)
     tests = [':'.join(tests[i::num_devices]) for i in xrange(num_devices)]
     tests = [t for t in tests if t]
 
   return (TestRunnerFactory, tests)