Merging 10 commit(s) from Chromium's toolchain-utils

Merged commit digest:
  f40d1b4 Android wrapper: Support wrapping clang-tidy
  1fe6209 toolchain-utils: Enable poison system warning in llvm-next
  8235802 crosperf: gsutil location changed
  22755b8 crosperf: Change video crosbolt benchmark to Tast version
  11847ae set shebangs to python2
  2a19734 Android wrapper: Support build.py without bundle.py
  0dcc7e3 afdo_metadata: Publish new profiles for kernel 4.4.
  5a53a33 toolchain-utils: fix an AFE locking bug and reformat status
  e79e326 afdo_metadata: Publish new profiles for Chrome.
  910ee63 afdo_metadata: Publish new profiles for kernel 3.18.

Change-Id: I204ac6dcca71bae3aac951eda4f59e44da538777

45 files changed, 129 insertions, 57 deletions

diff --git a/afdo_metadata/chrome_afdo.json b/afdo_metadata/chrome_afdo.json
index 006298df..f52f61d2 100644
--- a/afdo_metadata/chrome_afdo.json
+++ b/afdo_metadata/chrome_afdo.json
@@ -1,14 +1,14 @@
 {
     "silvermont": {
-        "name": "R79-3904.19-1569836348.afdo"
+        "name": "R79-3904.41-1570446057.afdo"
     }, 
     "benchmark": {
         "name": "chromeos-chrome-amd64-79.0.3931.2_rc-r1.afdo"
     }, 
     "airmont": {
-        "name": "R79-3904.19-1569838411.afdo"
+        "name": "R79-3904.35-1570450409.afdo"
     }, 
     "broadwell": {
-        "name": "R79-3903.0-1569840015.afdo"
+        "name": "R79-3904.35-1570441307.afdo"
     }
 }
\ No newline at end of file
diff --git a/afdo_metadata/kernel_afdo.json b/afdo_metadata/kernel_afdo.json
index cf5c53a3..dbf52fbb 100644
--- a/afdo_metadata/kernel_afdo.json
+++ b/afdo_metadata/kernel_afdo.json
@@ -3,9 +3,9 @@
         "name": "R79-12499.14-1569836097"
     }, 
     "chromeos-kernel-4_4": {
-        "name": "R79-12499.14-1569836190"
+        "name": "R79-12564.0-1570440907"
     }, 
     "chromeos-kernel-3_18": {
-        "name": "R79-12499.14-1569835937"
+        "name": "R79-12564.0-1570440773"
     }
 }
\ No newline at end of file
diff --git a/afe_lock_machine.py b/afe_lock_machine.py
index 2f35e9bf..5f3c7fc6 100755
--- a/afe_lock_machine.py
+++ b/afe_lock_machine.py
@@ -192,13 +192,12 @@ class AFELockManager(object):
       state: A dictionary of the current state of the machine.
       machine_type: MachineType to determine where the machine is located.
     """
+    if machine_type == MachineType.AFE and not m.endswith('.cros'):
+      m += '.cros'
     if state['locked']:
-      if (machine_type == MachineType.AFE and
-          m not in self.toolchain_lab_machines):
-        m += '.cros'
-      print('%s (%s)\t%slocked by %s since %s' %
-            (m, state['board'], '\t\t\t' if machine_type == MachineType.LOCAL
-             else '', state['locked_by'], state['lock_time']))
+      print('%s (%s)\t\t%slocked by %s since %s' %
+            (m, state['board'], '\t\t' if machine_type == MachineType.LOCAL else
+             '', state['locked_by'], state['lock_time']))
     else:
       print(
           '%s (%s)\t\t%sunlocked' % (m, state['board'], '\t\t' if
@@ -254,12 +253,8 @@ class AFELockManager(object):
     if should_lock_machine:
       kwargs['lock_reason'] = 'toolchain user request (%s)' % self.user
 
-    cros_name = machine + '.cros'
-    if cros_name in self.toolchain_lab_machines:
-      machine = cros_name
-    if machine in self.toolchain_lab_machines:
-      m = machine.split('.')[0]
-      afe_server = self.afe
+    m = machine.split('.')[0]
+    afe_server = self.afe
 
     try:
       afe_server.run(
@@ -456,6 +451,8 @@ class AFELockManager(object):
           values['lock_time'] = ''
         machine_list[name] = values
 
+    self.ListMachineStates(machine_list)
+
     return machine_list
 
   def CheckMachineInSkylab(self, machine):
diff --git a/automation/clients/android.py b/automation/clients/android.py
index 603744b1..06e76d29 100755
--- a/automation/clients/android.py
+++ b/automation/clients/android.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 #
 # Copyright 2011 Google Inc. All Rights Reserved.
 """Client for Android nightly jobs.
diff --git a/automation/clients/chromeos.py b/automation/clients/chromeos.py
index 084f7840..572320fd 100755
--- a/automation/clients/chromeos.py
+++ b/automation/clients/chromeos.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 #
 # Copyright 2011 Google Inc. All Rights Reserved.
 """chromeos.py: Build & Test ChromeOS using custom compilers."""
diff --git a/automation/clients/crosstool.py b/automation/clients/crosstool.py
index 65720343..9ba83807 100755
--- a/automation/clients/crosstool.py
+++ b/automation/clients/crosstool.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 #
 # Copyright 2011 Google Inc. All Rights Reserved.
 
diff --git a/automation/clients/dejagnu_compiler.py b/automation/clients/dejagnu_compiler.py
index eb923d5d..7448b87e 100755
--- a/automation/clients/dejagnu_compiler.py
+++ b/automation/clients/dejagnu_compiler.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 #
 # Copyright 2012 Google Inc. All Rights Reserved.
 """dejagnu_compiler.py: Run dejagnu test."""
diff --git a/automation/clients/nightly.py b/automation/clients/nightly.py
index 98e2b081..d35c4eca 100755
--- a/automation/clients/nightly.py
+++ b/automation/clients/nightly.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 #
 # Copyright 2010 Google Inc. All Rights Reserved.
 
diff --git a/automation/clients/output_test.py b/automation/clients/output_test.py
index 3126f050..73c26eed 100755
--- a/automation/clients/output_test.py
+++ b/automation/clients/output_test.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 #
 # Copyright 2010 Google Inc. All Rights Reserved.
 
diff --git a/automation/clients/pwd_test.py b/automation/clients/pwd_test.py
index a4b28552..493444d5 100755
--- a/automation/clients/pwd_test.py
+++ b/automation/clients/pwd_test.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 #
 # Copyright 2010 Google Inc. All Rights Reserved.
 
diff --git a/automation/clients/report/validate_failures.py b/automation/clients/report/validate_failures.py
index 5db356d1..d8776ba5 100755
--- a/automation/clients/report/validate_failures.py
+++ b/automation/clients/report/validate_failures.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 
 # Script to compare testsuite failures against a list of known-to-fail
 # tests.
diff --git a/automation/common/command_executer_test.py b/automation/common/command_executer_test.py
index 4aa245f0..2caaa146 100755
--- a/automation/common/command_executer_test.py
+++ b/automation/common/command_executer_test.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 #
 # Copyright 2011 Google Inc. All Rights Reserved.
 #
diff --git a/automation/common/machine_test.py b/automation/common/machine_test.py
index c9c200a9..f66299f5 100755
--- a/automation/common/machine_test.py
+++ b/automation/common/machine_test.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 #
 # Copyright 2010 Google Inc. All Rights Reserved.
 """Machine manager unittest.
diff --git a/automation/server/machine_manager_test.py b/automation/server/machine_manager_test.py
index 67fdcc2b..2fa5bb4b 100755
--- a/automation/server/machine_manager_test.py
+++ b/automation/server/machine_manager_test.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 #
 # Copyright 2010 Google Inc. All Rights Reserved.
 
diff --git a/automation/server/monitor/manage.py b/automation/server/monitor/manage.py
index 57deb5c2..59f6e216 100755
--- a/automation/server/monitor/manage.py
+++ b/automation/server/monitor/manage.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 #
 # Copyright 2011 Google Inc. All Rights Reserved.
 #
diff --git a/automation/server/server.py b/automation/server/server.py
index f02a1d0f..c8f22521 100755
--- a/automation/server/server.py
+++ b/automation/server/server.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 #
 # Copyright 2010 Google Inc. All Rights Reserved.
 
diff --git a/automation/server/server_test.py b/automation/server/server_test.py
index bcf1b9f5..131ebb3b 100755
--- a/automation/server/server_test.py
+++ b/automation/server/server_test.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 #
 # Copyright 2010 Google Inc. All Rights Reserved.
 """Machine manager unittest.
diff --git a/compiler_wrapper/android_config_test.go b/compiler_wrapper/android_config_test.go
index 6d51bfe9..4e2f1f5c 100644
--- a/compiler_wrapper/android_config_test.go
+++ b/compiler_wrapper/android_config_test.go
@@ -56,6 +56,10 @@ func createAndroidClangPathGoldenInputs(ctx *testContext) goldenFile {
 				Cmds:       okResults,
 			},
 			{
+				WrapperCmd: newGoldenCmd(filepath.Join(ctx.tempDir, "clang-tidy"), mainCc),
+				Cmds:       okResults,
+			},
+			{
 				WrapperCmd: newGoldenCmd(deepPath, mainCc),
 				Cmds:       okResults,
 			},
diff --git a/compiler_wrapper/build.py b/compiler_wrapper/build.py
index af3064e9..6b647714 100755
--- a/compiler_wrapper/build.py
+++ b/compiler_wrapper/build.py
@@ -10,6 +10,7 @@ from __future__ import print_function
 
 import argparse
 import os.path
+import re
 import subprocess
 import sys
 
@@ -45,8 +46,18 @@ def calc_go_args(args, version):
 
 
 def read_version(build_dir):
-  with open(os.path.join(build_dir, 'VERSION'), 'r') as r:
-    return r.read()
+  version_path = os.path.join(build_dir, 'VERSION')
+  if os.path.exists(version_path):
+    with open(version_path, 'r') as r:
+      return r.read()
+
+  last_commit_msg = subprocess.check_output(
+      ['git', '-C', build_dir, 'log', '-1', '--pretty=%B'])
+  # Use last found change id to support reverts as well.
+  change_ids = re.findall(r'Change-Id: (\w+)', last_commit_msg)
+  if not change_ids:
+    sys.exit("Couldn't find Change-Id in last commit message.")
+  return change_ids[-1]
 
 
 def main():
diff --git a/compiler_wrapper/bundle.py b/compiler_wrapper/bundle.py
index 63757f78..c1fa53e0 100755
--- a/compiler_wrapper/bundle.py
+++ b/compiler_wrapper/bundle.py
@@ -33,10 +33,11 @@ def copy_files(input_dir, output_dir):
 def read_change_id(input_dir):
   last_commit_msg = subprocess.check_output(
       ['git', '-C', input_dir, 'log', '-1', '--pretty=%B'])
-  match = re.search('Change-Id: (\\w+)', last_commit_msg)
-  if not match:
+  # Use last found change id to support reverts as well.
+  change_ids = re.findall(r'Change-Id: (\w+)', last_commit_msg)
+  if not change_ids:
     sys.exit("Couldn't find Change-Id in last commit message.")
-  return match.group(1)
+  return change_ids[-1]
 
 
 def write_readme(input_dir, output_dir, change_id):
diff --git a/compiler_wrapper/command.go b/compiler_wrapper/command.go
index 6c5beae1..26f85568 100644
--- a/compiler_wrapper/command.go
+++ b/compiler_wrapper/command.go
@@ -91,7 +91,12 @@ func getAbsCmdPath(env env, cmd *command) string {
 
 func newCommandBuilder(env env, cfg *config, cmd *command) (*commandBuilder, error) {
 	basename := filepath.Base(cmd.Path)
-	nameParts := strings.Split(basename, "-")
+	var nameParts []string
+	if basename == "clang-tidy" {
+		nameParts = []string{basename}
+	} else {
+		nameParts = strings.Split(basename, "-")
+	}
 	target := builderTarget{}
 	switch len(nameParts) {
 	case 1:
diff --git a/compiler_wrapper/config.go b/compiler_wrapper/config.go
index 2a3c5971..3720018e 100644
--- a/compiler_wrapper/config.go
+++ b/compiler_wrapper/config.go
@@ -99,6 +99,7 @@ var llvmNextFlags = []string{
 	"-Wno-final-dtor-non-final-class",
 	"-Wno-implicit-int-float-conversion",
 	"-Wno-return-stack-address",
+	"-Werror=poison-system-directories",
 }
 
 // Full hardening.
diff --git a/compiler_wrapper/testdata/android_golden/clang_path.json b/compiler_wrapper/testdata/android_golden/clang_path.json
index cab712b5..b784feb5 100644
--- a/compiler_wrapper/testdata/android_golden/clang_path.json
+++ b/compiler_wrapper/testdata/android_golden/clang_path.json
@@ -72,6 +72,27 @@
     "wd": "/tmp/stable",
     "wrapper": {
       "cmd": {
+        "path": "/tmp/stable/clang-tidy",
+        "args": [
+          "main.cc"
+        ]
+      }
+    },
+    "cmds": [
+      {
+        "cmd": {
+          "path": "/tmp/stable/clang-tidy.real",
+          "args": [
+            "main.cc"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "wd": "/tmp/stable",
+    "wrapper": {
+      "cmd": {
         "path": "a/b/c/d/e/f/g/clang",
         "args": [
           "main.cc"
diff --git a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/bisect.json b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/bisect.json
index f158f3da..905a8692 100644
--- a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/bisect.json
+++ b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/bisect.json
@@ -38,6 +38,7 @@
             "-Wno-final-dtor-non-final-class",
             "-Wno-implicit-int-float-conversion",
             "-Wno-return-stack-address",
+            "-Werror=poison-system-directories",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -98,6 +99,7 @@
             "-Wno-final-dtor-non-final-class",
             "-Wno-implicit-int-float-conversion",
             "-Wno-return-stack-address",
+            "-Werror=poison-system-directories",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -161,6 +163,7 @@
             "-Wno-final-dtor-non-final-class",
             "-Wno-implicit-int-float-conversion",
             "-Wno-return-stack-address",
+            "-Werror=poison-system-directories",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
diff --git a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clang_path.json b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clang_path.json
index f0472987..09f39ebd 100644
--- a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clang_path.json
+++ b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clang_path.json
@@ -29,6 +29,7 @@
             "-Wno-final-dtor-non-final-class",
             "-Wno-implicit-int-float-conversion",
             "-Wno-return-stack-address",
+            "-Werror=poison-system-directories",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -82,6 +83,7 @@
             "-Wno-final-dtor-non-final-class",
             "-Wno-implicit-int-float-conversion",
             "-Wno-return-stack-address",
+            "-Werror=poison-system-directories",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -135,6 +137,7 @@
             "-Wno-final-dtor-non-final-class",
             "-Wno-implicit-int-float-conversion",
             "-Wno-return-stack-address",
+            "-Werror=poison-system-directories",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -188,6 +191,7 @@
             "-Wno-final-dtor-non-final-class",
             "-Wno-implicit-int-float-conversion",
             "-Wno-return-stack-address",
+            "-Werror=poison-system-directories",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -248,6 +252,7 @@
             "-Wno-final-dtor-non-final-class",
             "-Wno-implicit-int-float-conversion",
             "-Wno-return-stack-address",
+            "-Werror=poison-system-directories",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -313,6 +318,7 @@
             "-Wno-final-dtor-non-final-class",
             "-Wno-implicit-int-float-conversion",
             "-Wno-return-stack-address",
+            "-Werror=poison-system-directories",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -372,6 +378,7 @@
             "-Wno-final-dtor-non-final-class",
             "-Wno-implicit-int-float-conversion",
             "-Wno-return-stack-address",
+            "-Werror=poison-system-directories",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -427,6 +434,7 @@
             "-Wno-final-dtor-non-final-class",
             "-Wno-implicit-int-float-conversion",
             "-Wno-return-stack-address",
+            "-Werror=poison-system-directories",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -477,6 +485,7 @@
             "-Wno-final-dtor-non-final-class",
             "-Wno-implicit-int-float-conversion",
             "-Wno-return-stack-address",
+            "-Werror=poison-system-directories",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -527,6 +536,7 @@
             "-Wno-final-dtor-non-final-class",
             "-Wno-implicit-int-float-conversion",
             "-Wno-return-stack-address",
+            "-Werror=poison-system-directories",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -577,6 +587,7 @@
             "-Wno-final-dtor-non-final-class",
             "-Wno-implicit-int-float-conversion",
             "-Wno-return-stack-address",
+            "-Werror=poison-system-directories",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -630,6 +641,7 @@
             "-Wno-final-dtor-non-final-class",
             "-Wno-implicit-int-float-conversion",
             "-Wno-return-stack-address",
+            "-Werror=poison-system-directories",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
diff --git a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clangtidy.json b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clangtidy.json
index 4ff173cb..d4b1e970 100644
--- a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clangtidy.json
+++ b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clangtidy.json
@@ -44,6 +44,7 @@
             "-Wno-final-dtor-non-final-class",
             "-Wno-implicit-int-float-conversion",
             "-Wno-return-stack-address",
+            "-Werror=poison-system-directories",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -74,6 +75,7 @@
             "-Wno-final-dtor-non-final-class",
             "-Wno-implicit-int-float-conversion",
             "-Wno-return-stack-address",
+            "-Werror=poison-system-directories",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -134,6 +136,7 @@
             "-Wno-final-dtor-non-final-class",
             "-Wno-implicit-int-float-conversion",
             "-Wno-return-stack-address",
+            "-Werror=poison-system-directories",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -165,6 +168,7 @@
             "-Wno-final-dtor-non-final-class",
             "-Wno-implicit-int-float-conversion",
             "-Wno-return-stack-address",
+            "-Werror=poison-system-directories",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -227,6 +231,7 @@
             "-Wno-final-dtor-non-final-class",
             "-Wno-implicit-int-float-conversion",
             "-Wno-return-stack-address",
+            "-Werror=poison-system-directories",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -261,6 +266,7 @@
             "-Wno-final-dtor-non-final-class",
             "-Wno-implicit-int-float-conversion",
             "-Wno-return-stack-address",
+            "-Werror=poison-system-directories",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -324,6 +330,7 @@
             "-Wno-final-dtor-non-final-class",
             "-Wno-implicit-int-float-conversion",
             "-Wno-return-stack-address",
+            "-Werror=poison-system-directories",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -355,6 +362,7 @@
             "-Wno-final-dtor-non-final-class",
             "-Wno-implicit-int-float-conversion",
             "-Wno-return-stack-address",
+            "-Werror=poison-system-directories",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
diff --git a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/force_disable_werror.json b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/force_disable_werror.json
index d459417d..e197de4c 100644
--- a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/force_disable_werror.json
+++ b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/force_disable_werror.json
@@ -32,6 +32,7 @@
             "-Wno-final-dtor-non-final-class",
             "-Wno-implicit-int-float-conversion",
             "-Wno-return-stack-address",
+            "-Werror=poison-system-directories",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -85,6 +86,7 @@
             "-Wno-final-dtor-non-final-class",
             "-Wno-implicit-int-float-conversion",
             "-Wno-return-stack-address",
+            "-Werror=poison-system-directories",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -124,6 +126,7 @@
             "-Wno-final-dtor-non-final-class",
             "-Wno-implicit-int-float-conversion",
             "-Wno-return-stack-address",
+            "-Werror=poison-system-directories",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -180,6 +183,7 @@
             "-Wno-final-dtor-non-final-class",
             "-Wno-implicit-int-float-conversion",
             "-Wno-return-stack-address",
+            "-Werror=poison-system-directories",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -219,6 +223,7 @@
             "-Wno-final-dtor-non-final-class",
             "-Wno-implicit-int-float-conversion",
             "-Wno-return-stack-address",
+            "-Werror=poison-system-directories",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
diff --git a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/gcc_clang_syntax.json b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/gcc_clang_syntax.json
index c692036d..a4305412 100644
--- a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/gcc_clang_syntax.json
+++ b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/gcc_clang_syntax.json
@@ -29,6 +29,7 @@
             "-Wno-final-dtor-non-final-class",
             "-Wno-implicit-int-float-conversion",
             "-Wno-return-stack-address",
+            "-Werror=poison-system-directories",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -103,6 +104,7 @@
             "-Wno-final-dtor-non-final-class",
             "-Wno-implicit-int-float-conversion",
             "-Wno-return-stack-address",
+            "-Werror=poison-system-directories",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -171,6 +173,7 @@
             "-Wno-final-dtor-non-final-class",
             "-Wno-implicit-int-float-conversion",
             "-Wno-return-stack-address",
+            "-Werror=poison-system-directories",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -223,6 +226,7 @@
             "-Wno-final-dtor-non-final-class",
             "-Wno-implicit-int-float-conversion",
             "-Wno-return-stack-address",
+            "-Werror=poison-system-directories",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
diff --git a/crb/crb_driver.py b/crb/crb_driver.py
index 8c767fb8..c6403462 100755
--- a/crb/crb_driver.py
+++ b/crb/crb_driver.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 #
 # Copyright 2010 Google Inc. All Rights Reserved.
 
diff --git a/crosperf/download_images.py b/crosperf/download_images.py
index 0eb9b8a1..e02c5817 100644
--- a/crosperf/download_images.py
+++ b/crosperf/download_images.py
@@ -14,7 +14,7 @@ import test_flag
 
 from cros_utils import command_executer
 
-GS_UTIL = 'chromium/tools/depot_tools/gsutil.py'
+GS_UTIL = 'src/chromium/depot_tools/gsutil.py'
 
 
 class MissingImage(Exception):
diff --git a/crosperf/download_images_unittest.py b/crosperf/download_images_unittest.py
index 8d9b9e72..68a84676 100755
--- a/crosperf/download_images_unittest.py
+++ b/crosperf/download_images_unittest.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python2
-#-*- coding: utf-8 -*-
+# -*- coding: utf-8 -*-
 # Copyright 2019 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
@@ -68,7 +68,7 @@ class ImageDownloaderTestcast(unittest.TestCase):
     # Verify we called RunCommand once, with proper arguments.
     self.assertEqual(mock_cmd_exec.RunCommand.call_count, 1)
     expected_args = (
-        '/usr/local/home/chromeos/chromium/tools/depot_tools/gsutil.py '
+        '/usr/local/home/chromeos/src/chromium/depot_tools/gsutil.py '
         'cp gs://chromeos-image-archive/lumpy-release/R36-5814.0.0/'
         'chromiumos_test_image.tar.xz '
         '/usr/local/home/chromeos/chroot/tmp/lumpy-release/R36-5814.0.0')
diff --git a/crosperf/experiment_factory.py b/crosperf/experiment_factory.py
index 5d004256..563f3ac6 100644
--- a/crosperf/experiment_factory.py
+++ b/crosperf/experiment_factory.py
@@ -72,10 +72,10 @@ telemetry_crosbolt_perf_tests = [
     'loading.desktop',
     #'rendering.desktop',
 ]
-# TODO: replace video_PlaybackPerf.vp9 with the tast version
+
 crosbolt_perf_tests = [
     'graphics_WebGLAquarium',
-    'video_PlaybackPerf.vp9',
+    'tast.video.PlaybackPerfVP91080P30FPS',
 ]
 
 #    'cheets_AntutuTest',
diff --git a/crosperf/suite_runner.py b/crosperf/suite_runner.py
index 43d5bca3..01e7114f 100644
--- a/crosperf/suite_runner.py
+++ b/crosperf/suite_runner.py
@@ -18,7 +18,7 @@ from cros_utils import command_executer
 TEST_THAT_PATH = '/usr/bin/test_that'
 # TODO: Need to check whether Skylab is installed and set up correctly.
 SKYLAB_PATH = '/usr/local/bin/skylab'
-GS_UTIL = 'chromium/tools/depot_tools/gsutil.py'
+GS_UTIL = 'src/chromium/depot_tools/gsutil.py'
 AUTOTEST_DIR = '~/trunk/src/third_party/autotest/files'
 CHROME_MOUNT_DIR = '/tmp/chrome_root'
 
diff --git a/crosperf/suite_runner_unittest.py b/crosperf/suite_runner_unittest.py
index 8b5b1f13..8b336eda 100755
--- a/crosperf/suite_runner_unittest.py
+++ b/crosperf/suite_runner_unittest.py
@@ -927,12 +927,12 @@ class SuiteRunnerTest(unittest.TestCase):
     self.assertEqual(mock_runcmd.call_count, 2)
     cmd = mock_runcmd.call_args_list[0][0][0]
     self.assertEqual(cmd,
-                     ('/tmp/chromeos/chromium/tools/depot_tools/gsutil.py ls '
+                     ('/tmp/chromeos/src/chromium/depot_tools/gsutil.py ls '
                       'gs://chromeos-autotest-results/swarming-12345/'
                       'autoserv_test'))
     cmd = mock_runcmd.call_args_list[1][0][0]
     self.assertEqual(cmd,
-                     ('/tmp/chromeos/chromium/tools/depot_tools/gsutil.py -mq '
+                     ('/tmp/chromeos/src/chromium/depot_tools/gsutil.py -mq '
                       'cp -r gs://chromeos-autotest-results/swarming-12345 '
                       '/tmp/chromeos/chroot/tmp'))
 
diff --git a/cwp/bartlett/server.py b/cwp/bartlett/server.py
index f6b35361..8fb7d61e 100755
--- a/cwp/bartlett/server.py
+++ b/cwp/bartlett/server.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 # Copyright 2012 Google Inc. All Rights Reserved.
 # Author: mrdmnd@ (Matt Redmond)
 # Based off of code in //depot/google3/experimental/mobile_gwp
diff --git a/debug_info_test/debug_info_test.py b/debug_info_test/debug_info_test.py
index f5afd644..4839e69c 100755
--- a/debug_info_test/debug_info_test.py
+++ b/debug_info_test/debug_info_test.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 
 # Copyright 2018 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
diff --git a/dejagnu/gdb_dejagnu.py b/dejagnu/gdb_dejagnu.py
index eb298e6a..91fa51fd 100755
--- a/dejagnu/gdb_dejagnu.py
+++ b/dejagnu/gdb_dejagnu.py
@@ -1,4 +1,4 @@
-#! /usr/bin/python
+#!/usr/bin/python2
 
 # Copyright (c) 2013 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
diff --git a/dejagnu/run_dejagnu.py b/dejagnu/run_dejagnu.py
index b4cbc8f4..7b6e6fa3 100755
--- a/dejagnu/run_dejagnu.py
+++ b/dejagnu/run_dejagnu.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 #
 # Copyright 2010 Google Inc. All Rights Reserved.
 """Tool script for auto dejagnu."""
diff --git a/fdo_scripts/divide_and_merge_profiles.py b/fdo_scripts/divide_and_merge_profiles.py
index 99155852..5108aa6f 100755
--- a/fdo_scripts/divide_and_merge_profiles.py
+++ b/fdo_scripts/divide_and_merge_profiles.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 #
 # Copyright 2011 Google Inc. All Rights Reserved.
 """Script to divide and merge profiles."""
diff --git a/fdo_scripts/divide_and_merge_profiles_test.py b/fdo_scripts/divide_and_merge_profiles_test.py
index 27141df3..2bfb5cf1 100755
--- a/fdo_scripts/divide_and_merge_profiles_test.py
+++ b/fdo_scripts/divide_and_merge_profiles_test.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 #
 # Copyright 2010 Google Inc. All Rights Reserved.
 
diff --git a/fdo_scripts/profile_cycler.py b/fdo_scripts/profile_cycler.py
index 7715612f..176f2d4a 100755
--- a/fdo_scripts/profile_cycler.py
+++ b/fdo_scripts/profile_cycler.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 #
 # Copyright 2011 Google Inc. All Rights Reserved.
 """Script to profile a page cycler, and get it back to the host."""
diff --git a/mem_tests/clean_data.py b/mem_tests/clean_data.py
index f9a11e75..1433ba41 100755
--- a/mem_tests/clean_data.py
+++ b/mem_tests/clean_data.py
@@ -1,4 +1,4 @@
-#! /usr/bin/python
+#!/usr/bin/python2
 """Cleans output from other scripts to eliminate duplicates.
 
 When frequently sampling data, we see that records occasionally will contain
diff --git a/mem_tests/mem_groups.py b/mem_tests/mem_groups.py
index e2fbf271..5d593872 100755
--- a/mem_tests/mem_groups.py
+++ b/mem_tests/mem_groups.py
@@ -1,4 +1,4 @@
-#! /usr/bin/python
+#!/usr/bin/python2
 """Groups memory by allocation sizes.
 
 Takes a log entry and sorts sorts everything into groups based on what size
diff --git a/mem_tests/total_mem_actual.py b/mem_tests/total_mem_actual.py
index 2d53bebe..d2a0cedf 100755
--- a/mem_tests/total_mem_actual.py
+++ b/mem_tests/total_mem_actual.py
@@ -1,4 +1,4 @@
-#! /usr/bin/python
+#!/usr/bin/python2
 """Parses the actual memory usage from TCMalloc.
 
 This goes through logs that have the actual allocated memory (not sampled) in
diff --git a/mem_tests/total_mem_sampled.py b/mem_tests/total_mem_sampled.py
index 77dd6817..32aa527c 100755
--- a/mem_tests/total_mem_sampled.py
+++ b/mem_tests/total_mem_sampled.py
@@ -1,4 +1,4 @@
-#! /usr/bin/python
+#!/usr/bin/python2
 """Parses the total amount of sampled memory from log files.
 
 This file outputs the total amount of memory that has been sampled by tcmalloc.