Unset some environment vars so they can be set up via the bisect script.

tools/bisect-perf-regression.py

Index: tools/bisect-perf-regression.py
diff --git a/tools/bisect-perf-regression.py b/tools/bisect-perf-regression.py
index 37eef69cb578f1f1be666233461ab2766cff502b..d34bc7cfb161e4da3d291b0a735baad75fd9b8de 100755
--- a/tools/bisect-perf-regression.py
+++ b/tools/bisect-perf-regression.py
@@ -294,7 +294,12 @@ def CheckRunGit(command):
 
 
 def BuildWithMake(threads, targets):
-  cmd = ['make', 'BUILDTYPE=Release', '-j%d' % threads] + targets
+  cmd = ['make', 'BUILDTYPE=Release']
+
+  if threads:
+    cmd.append('-j%d' % threads)
+
+  cmd += targets
 
   return_code = RunProcess(cmd)
 
@@ -302,8 +307,12 @@ def BuildWithMake(threads, targets):
 
 
 def BuildWithNinja(threads, targets):
-  cmd = ['ninja', '-C', os.path.join('out', 'Release'),
-      '-j%d' % threads] + targets
+  cmd = ['ninja', '-C', os.path.join('out', 'Release')]
+
+  if threads:
+    cmd.append('-j%d' % threads)
+
+  cmd += targets
 
   return_code = RunProcess(cmd)
 
@@ -346,7 +355,7 @@ class DesktopBuilder(Builder):
     """
     targets = ['chrome', 'performance_ui_tests']
 
-    threads = 16
+    threads = 0

[tonyg, 2013/07/11 01:34:28]

None instead of 0?

[shatch, 2013/07/11 20:51:06]

Done.

     if opts.use_goma:
       threads = 64
 
@@ -380,6 +389,12 @@ class AndroidBuilder(Builder):
     cmd = [path_to_tool, '--apk', 'ContentShell.apk', '--apk_package',
         'org.chromium.content_shell_apk', '--release']
     return_code = RunProcess(cmd)
+
+    if not return_code:
+      cmd = [path_to_tool, '--apk', 'ChromiumTestShell.apk', '--apk_package',
+             'org.chromium.chrome.testshell', '--release']
+      return_code = RunProcess(cmd)
+
     return not return_code
 
   def Build(self, depot, opts):
@@ -393,8 +408,9 @@ class AndroidBuilder(Builder):
     Returns:
         True if build was successful.
     """
-    targets = ['content_shell_apk', 'forwarder2', 'md5sum']
-    threads = 16
+    targets = ['chromium_testshell', 'content_shell_apk', 'forwarder2',

[tonyg, 2013/07/11 01:34:28]

I think the target is chromium_testshell_test_apk, right? Also, can we totally
remove content_shell_apk?

[bulach, 2013/07/11 14:52:58]

drive-by:
chromium_testshell is the "app", that is, similar level as "chrome" and "content
shell".
chromium_testshell_test_apk is the instrumentation tests for the app.

[shatch, 2013/07/11 20:51:06]

Ok, so chromium_testshell is the correct one to build?

[shatch, 2013/07/11 20:51:06]

Done.

+               'md5sum']
+    threads = 0
     if opts.use_goma:
       threads = 64
 
@@ -525,7 +541,7 @@ class SourceControl(object):
       The return code of the call.
     """
     return bisect_utils.RunGClient(['sync', '--revision',
-        revision, '--verbose'])
+        revision, '--verbose', '--nohooks'])
 
   def SyncToRevisionWithRepo(self, timestamp):
     """Uses repo to sync all the underlying git depots to the specified
@@ -1185,6 +1201,13 @@ class BisectPerformanceMetrics(object):
     Returns:
       True if successful.
     """
+    if self.opts.target_platform == 'android':
+      cwd = os.getcwd()
+      os.chdir(os.path.join(self.src_cwd, '..'))
+      if not bisect_utils.SetupAndroidBuildEnvironment(self.opts):
+        return False
+      os.chdir(cwd)
+
     if depot == 'cros':
       return self.CreateCrosChroot()
     else: