chromeos: Manually roll chromite to pick up Simple Chrome SDK cache changes.

This rolls chromite to crrev.com/c/1863321. That picks up a change to how
artifacts in the Simple Chrome SDK cache are stored. Since we add some of
those artifacts to a test target's data deps, we also need to tweak them
a little to conform to the new cache layout.

Bug: 1012981
Change-Id: I5510be69ec38de31b6cedec2b45a182b91275589
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1884279Reviewed-by: Dirk Pranke <dpranke@chromium.org>
Reviewed-by: Achuith Bhandarkar <achuith@chromium.org>
Commit-Queue: Ben Pastene <bpastene@chromium.org>
Cr-Commit-Position: refs/heads/master@{#710379}

DEPS

@@ -871,7 +871,7 @@ deps = {
 
   # Build tools for Chrome OS. Note: This depends on third_party/pyelftools.
   'src/third_party/chromite': {
-      'url': Var('chromium_git') + '/chromiumos/chromite.git' + '@' + 'c5f1be68e3ff3b183c19c977a38cc8e7185cd21a',
+      'url': Var('chromium_git') + '/chromiumos/chromite.git' + '@' + '94885526dc6160d97aa791e3d5af51029f6d499e',
       'condition': 'checkout_linux',
   },
 

build/config/chromeos/rules.gni

@@ -62,7 +62,7 @@ template("generate_runner_script") {
   # These are the only 2 conditions when ${_cache_path_prefix} is used, so
   # initialize it in a conditional.
   if (deploy_chrome || cros_is_vm) {
-    _cache_path_prefix = "//build/cros_cache/chrome-sdk/tarballs/${cros_board}+${cros_sdk_version}"
+    _cache_path_prefix = "//build/cros_cache/chrome-sdk/tarballs/"
   }
 
   assert(defined(generated_script),
@@ -98,7 +98,10 @@ template("generate_runner_script") {
       "//build/android/pylib/results/",
       generated_script,
       "//build/chromeos/",
+
+      # Needed for various SDK components used below.
       "//build/cros_cache/chrome-sdk/misc/",
+      "//build/cros_cache/chrome-sdk/symlinks/",
 
       # We use luci-py's subprocess42 to launch test processes.
       "//tools/swarming_client/utils/",
@@ -112,9 +115,9 @@ template("generate_runner_script") {
     # Add the VM/QEMU-launching bits if needed.
     if (cros_is_vm) {
       assert(defined(_cache_path_prefix))
-      _vm_image_path = "${_cache_path_prefix}+chromiumos_qemu_image.tar.xz/"
-      _qemu_dir = "${_cache_path_prefix}+app-emulation/"
-      _firmware_dir = "${_cache_path_prefix}+sys-firmware/"
+      _vm_image_path = "${_cache_path_prefix}/chromiumos_qemu_image.tar.xz/"
+      _qemu_dir = "${_cache_path_prefix}/app-emulation/"
+      _firmware_dir = "${_cache_path_prefix}/sys-firmware/"
       data += [
         _firmware_dir,
         _vm_image_path,
@@ -123,8 +126,8 @@ template("generate_runner_script") {
     }
     if (is_tast) {
       data += [
-        "${_cache_path_prefix}+chromeos-base/tast-cmd/",
-        "${_cache_path_prefix}+chromeos-base/tast-remote-tests-cros/",
+        "${_cache_path_prefix}/chromeos-base/tast-cmd/",
+        "${_cache_path_prefix}/chromeos-base/tast-remote-tests-cros/",
       ]
     }
     if (defined(invoker.data)) {
@@ -159,8 +162,8 @@ template("generate_runner_script") {
       # toolchain to the data.
       assert(defined(_cache_path_prefix))
       data += [
-        "${_cache_path_prefix}+environment_chromeos-base_chromeos-chrome.tar.xz",
-        "${_cache_path_prefix}+target_toolchain/",
+        "${_cache_path_prefix}/environment_chromeos-base_chromeos-chrome.tar.xz",
+        "${_cache_path_prefix}/target_toolchain/",
       ]
     }