Roll //build, //native_client, and a few more targets of opportunity.

build/android/pylib/utils/isolator.py

 # Copyright 2014 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 fnmatch
 import glob
 import os
 import shutil
 import sys
 
 from pylib import cmd_helper
 from pylib import constants
 
 
 _ISOLATE_SCRIPT = os.path.join(
     constants.DIR_SOURCE_ROOT, 'tools', 'swarming_client', 'isolate.py')
 
 
 def DefaultPathVariables():
   return {
     'DEPTH': constants.DIR_SOURCE_ROOT,
     'PRODUCT_DIR': constants.GetOutDirectory(),
   }
 
 
 def DefaultConfigVariables():
+  # Note: This list must match the --config-vars in build/isolate.gypi
   return {
     'CONFIGURATION_NAME': constants.GetBuildType(),
     'OS': 'android',
     'asan': '0',
+    'branding': 'Chromium',
     'chromeos': '0',
     'component': 'static_library',
+    'enable_pepper_cdms': '0',
+    'enable_plugins': '0',
     'fastbuild': '0',
     'icu_use_data_file_flag': '1',
     'lsan': '0',
     'msan': '0',
     # TODO(maruel): This may not always be true.
     'target_arch': 'arm',
     'tsan': '0',
     'use_custom_libcxx': '0',
     'use_instrumented_libraries': '0',
+    'use_prebuilt_instrumented_libraries': '0',
     'use_openssl': '0',
     'use_ozone': '0',
     'use_x11': '0',
     'v8_use_external_startup_data': '1',
   }
 
 
 class Isolator(object):
   """Manages calls to isolate.py for the android test runner scripts."""
 
@@ skipping 106 matching lines @@
         shutil.move(os.path.join(root, filename), paks_dir)
 
     # Move everything in PRODUCT_DIR to top level.
     deps_product_dir = os.path.join(deps_out_dir, constants.GetBuildType())
     if os.path.isdir(deps_product_dir):
       for p in os.listdir(deps_product_dir):
         shutil.move(os.path.join(deps_product_dir, p), self._isolate_deps_dir)
       os.rmdir(deps_product_dir)
       os.rmdir(deps_out_dir)