[fuchsia] Use new path for Fuchsia host tools.

Bug: 1024086
Change-Id: I9ad0d1d7ab2bb0b65c1c31257b451ecb4b327610
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1970831Reviewed-by: Kevin Marshall <kmarshall@chromium.org>
Commit-Queue: Stephen Roe <steveroe@google.com>
Auto-Submit: Stephen Roe <steveroe@google.com>
Cr-Commit-Position: refs/heads/master@{#726138}

DEPS

@@ -928,19 +928,6 @@ deps = {
       'condition': 'checkout_linux',
   },
 
-  # TODO(steveroe): Get this from GCS instead of CIPD once the arm64 sdk is
-  # released using the same version specified in build/fuchsia/linux.sdk.sha1.
-  'src/third_party/fuchsia-sdk-arm64': {
-      'packages': [
-          {
-              'package': 'fuchsia/sdk/core/linux-arm64',
-              'version': 'xbqDSJKkLORclZW8h9et17dVsOjaxurf7RElMu0fGvUC'
-          },
-      ],
-      'condition': 'host_os == "linux" and (checkout_fuchsia and checkout_fuchsia_for_arm64_host)',
-      'dep_type': 'cipd',
-  },
-
   'src/third_party/grpc/src': {
       'url': Var('chromium_git') + '/external/github.com/grpc/grpc.git' + '@' + '74b981a6a3d9ba17f3acae1d72b9109325ef656d',
   },

build/config/fuchsia/generate_runner_scripts.gni

@@ -86,10 +86,6 @@ template("fuchsia_package_runner") {
       _manifest_path,
       "//build/fuchsia/",
       "//build/util/lib/",
-      "${fuchsia_sdk}/tools/fvm",
-      "${fuchsia_sdk}/tools/pm",
-      "${fuchsia_sdk}/tools/symbolize",
-      "${fuchsia_sdk}/tools/zbi",
       "${fuchsia_sdk}/.build-id/",
       "${boot_image_root}/qemu/qemu-kernel.kernel",
       "${boot_image_root}/qemu/storage-full.blk",
@@ -102,15 +98,22 @@ template("fuchsia_package_runner") {
 
     if (host_os == "linux" && host_cpu == "x64" && target_cpu == "arm64") {
       data += [
-        # Host tools for qemu on arm64 test bots.
+        # Host tools for arm64 test bots.
+        "${fuchsia_sdk}/tools/arm64/fvm",
+        "${fuchsia_sdk}/tools/arm64/pm",
+        "${fuchsia_sdk}/tools/arm64/symbolize",
+        "${fuchsia_sdk}/tools/arm64/zbi",
         "${qemu_arm64_root}/",
-        "${fuchsia_arm64_sdk}/",
       ]
     } else {
       data += [
-        # Host tools for qemu on x64 test bots.
-        "//third_party/llvm-build/Release+Asserts/bin/llvm-symbolizer",
+        # Host tools for x64 test bots.
+        "${fuchsia_sdk}/tools/x64/fvm",
+        "${fuchsia_sdk}/tools/x64/pm",
+        "${fuchsia_sdk}/tools/x64/symbolize",
+        "${fuchsia_sdk}/tools/x64/zbi",
         "${qemu_root}/",
+        "//third_party/llvm-build/Release+Asserts/bin/llvm-symbolizer",
       ]
     }
 

build/fuchsia/common.py

@@ -11,12 +11,11 @@ import sys
 
 DIR_SOURCE_ROOT = os.path.abspath(
     os.path.join(os.path.dirname(__file__), os.pardir, os.pardir))
+IMAGES_ROOT = os.path.join(
+    DIR_SOURCE_ROOT, 'third_party', 'fuchsia-sdk', 'images')
 SDK_ROOT = os.path.join(DIR_SOURCE_ROOT, 'third_party', 'fuchsia-sdk', 'sdk')
-IMAGES_ROOT = os.path.join(DIR_SOURCE_ROOT, 'third_party', 'fuchsia-sdk',
-                           'images')
-ARM64_SDK_TOOLS = os.path.join(DIR_SOURCE_ROOT, 'third_party',
-                               'fuchsia-sdk-arm64', 'tools')
-X64_SDK_TOOLS = os.path.join(SDK_ROOT, 'tools')
+ARM64_SDK_TOOLS = os.path.join(SDK_ROOT, 'tools', 'arm64')
+X64_SDK_TOOLS = os.path.join(SDK_ROOT, 'tools', 'x64')
 
 def EnsurePathExists(path):
   """Checks that the file |path| exists on the filesystem and returns the path