lightweight builds archiving for mac and win64

scripts/slave/recipe_modules/chromium_tests/chromium_perf.py

Index: scripts/slave/recipe_modules/chromium_tests/chromium_perf.py
diff --git a/scripts/slave/recipe_modules/chromium_tests/chromium_perf.py b/scripts/slave/recipe_modules/chromium_tests/chromium_perf.py
index 286265d1d1cb35e47093a5ac7fb8d2fa2897147f..bd3947e17371973731c5876ee41e7e1b41b56430 100644
--- a/scripts/slave/recipe_modules/chromium_tests/chromium_perf.py
+++ b/scripts/slave/recipe_modules/chromium_tests/chromium_perf.py
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 import collections
-
+import manual_bisect_files
 from . import steps
 
 
@@ -17,7 +17,11 @@ SPEC = {
     # Bucket for storing builds for manual bisect
     'bisect_build_gs_bucket': 'chrome-test-builds',
     'bisect_build_gs_extra': 'official-by-commit',
-    'bisect_builders': []
+    'bisect_builders': [],
+    # Parameters to repackage builds for bisect
+    'bisect_include_files': {},
+    'bisect_strip_files': {},
+    'bisect_whitelist': {}
   },
 }
 
@@ -97,7 +101,8 @@ def _TestSpec(config_name, parent_builder, perf_id, platform, target_bits,
   return spec
 
 
-def _AddBuildSpec(name, platform, target_bits=64, add_to_bisect=False):
+def _AddBuildSpec(name, platform, target_bits=64, bisect_include_files=None,
+                  bisect_strip_files=None, bisect_whitelist=None):
   if target_bits == 64:
     perf_id = platform
   else:
@@ -107,9 +112,13 @@ def _AddBuildSpec(name, platform, target_bits=64, add_to_bisect=False):
       'chromium_perf', perf_id, platform, target_bits)
   assert target_bits not in _builders[platform]
   _builders[platform][target_bits] = name
-  if add_to_bisect:
+  if bisect_include_files:
     SPEC['settings']['bisect_builders'].append(name)
-
+    SPEC['settings']['bisect_include_files'][name] = bisect_include_files
+    if bisect_strip_files:
+      SPEC['settings']['bisect_strip_files'][name] = bisect_strip_files
+    if bisect_whitelist:
+      SPEC['settings']['bisect_whitelist'][name] = bisect_whitelist
 
 def _AddTestSpec(name, perf_id, platform, target_bits=64,
                  max_battery_temp=350, num_host_shards=1, num_device_shards=1):
@@ -124,9 +133,27 @@ def _AddTestSpec(name, perf_id, platform, target_bits=64,
 _AddBuildSpec('Android Builder', 'android', target_bits=32)
 _AddBuildSpec('Android arm64 Builder', 'android')
 _AddBuildSpec('Win Builder', 'win', target_bits=32)
-_AddBuildSpec('Win x64 Builder', 'win')
-_AddBuildSpec('Mac Builder', 'mac')
-_AddBuildSpec('Linux Builder', 'linux', add_to_bisect=True)
+_AddBuildSpec('Win x64 Builder', 'win', 
+              bisect_include_files=(
+              manual_bisect_files.CHROME_REQUIRED_FILES['Win x64 Builder']),
+              bisect_strip_files=(
+              manual_bisect_files.CHROME_STRIP_LIST['Win x64 Builder']),
+              bisect_whitelist=(
+              manual_bisect_files.CHROME_WHITELIST_FILES['Win x64 Builder']))
+_AddBuildSpec('Mac Builder', 'mac',
+              bisect_include_files=(
+              manual_bisect_files.CHROME_REQUIRED_FILES['Mac Builder']),
+              bisect_strip_files=(
+              manual_bisect_files.CHROME_STRIP_LIST['Mac Builder']),
+              bisect_whitelist=(
+              manual_bisect_files.CHROME_WHITELIST_FILES['Mac Builder']))
+_AddBuildSpec('Linux Builder', 'linux',
+              bisect_include_files=(
+              manual_bisect_files.CHROME_REQUIRED_FILES['Linux Builder']),
+              bisect_strip_files=(
+              manual_bisect_files.CHROME_STRIP_LIST['Linux Builder']),
+              bisect_whitelist=(
+              manual_bisect_files.CHROME_WHITELIST_FILES['Linux Builder']))
 
 
 _AddTestSpec('Android Galaxy S5 Perf', 'android-galaxy-s5', 'android',