clang packaging: Stop uploading llvm-strip package.

Per discussion on bug.

Bug: 877080
Change-Id: I7d5c8c4a5ab6887c1cc9885b8035c3bb83a2e9b3
Reviewed-on: https://chromium-review.googlesource.com/c/1443513Reviewed-by: Fabrice de Gans-Riberi <fdegans@chromium.org>
Commit-Queue: Nico Weber <thakis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#627958}

build/toolchain/fuchsia/BUILD.gn

@@ -15,7 +15,6 @@ template("fuchsia_clang_toolchain") {
 
     # We want to build and strip binaries, but retain the unstripped binaries
     # in runtime_deps to make them available for isolates.
-    # TODO(https://crbug.com/877080): Switch to llvm-strip.
     if (host_os == "linux") {
       strip = rebase_path("//buildtools/third_party/eu-strip/bin/eu-strip",
                           root_build_dir)

tools/clang/scripts/download_strip.py

-#!/usr/bin/env python
-# Copyright 2018 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-"""Script to download llvm-strip from google storage."""
-
-import os
-import sys
-
-import update
-
-LLVM_BUILD_DIR = update.LLVM_BUILD_DIR
-STRIP_PATH = os.path.join(LLVM_BUILD_DIR, 'bin', 'llvm-strip')
-STAMP_FILE = os.path.normpath(
-    os.path.join(LLVM_BUILD_DIR, 'llvmstrip_build_revision'))
-
-
-def AlreadyUpToDate():
-  if not os.path.exists(STRIP_PATH):
-    return False
-  stamp = update.ReadStampFile(STAMP_FILE)
-  return stamp.rstrip() == update.PACKAGE_VERSION
-
-
-def main():
-  if not AlreadyUpToDate():
-    cds_file = 'llvmstrip-%s.tgz' % update.PACKAGE_VERSION
-    cds_full_url = update.GetPlatformUrlPrefix(sys.platform) + cds_file
-    update.DownloadAndUnpack(cds_full_url, update.LLVM_BUILD_DIR)
-  return 0
-
-
-if __name__ == '__main__':
-  sys.exit(main())

tools/clang/scripts/package.py

@@ -494,26 +494,6 @@ def main():
               filter=PrintTarProgress)
     MaybeUpload(args, llddir, platform)
 
-  # On Linux and Mac, package and upload llvm-strip in a separate zip.
-  # This is used for the Fuchsia build.
-  if sys.platform == 'darwin' or sys.platform.startswith('linux'):
-    stripdir = 'llvmstrip-' + stamp
-    shutil.rmtree(stripdir, ignore_errors=True)
-    os.makedirs(os.path.join(stripdir, 'bin'))
-    shutil.copy(os.path.join(LLVM_RELEASE_DIR, 'bin', 'llvm-strip'),
-                os.path.join(stripdir, 'bin'))
-    llvmstrip_stamp_file_base = 'llvmstrip_build_revision'
-    llvmstrip_stamp_file = os.path.join(stripdir, llvmstrip_stamp_file_base)
-    with open(llvmstrip_stamp_file, 'w') as f:
-      f.write(expected_stamp)
-      f.write('\n')
-    with tarfile.open(stripdir + '.tgz', 'w:gz') as tar:
-      tar.add(os.path.join(stripdir, 'bin'), arcname='bin',
-              filter=PrintTarProgress)
-      tar.add(llvmstrip_stamp_file, arcname=llvmstrip_stamp_file_base,
-              filter=PrintTarProgress)
-    MaybeUpload(args, stripdir, platform)
-
   # Zip up the translation_unit tool.
   translation_unit_dir = 'translation_unit-' + stamp
   shutil.rmtree(translation_unit_dir, ignore_errors=True)