commit 2a4d90026e1e194657de3c701d8867a48005ad5a
author Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com> Tue Nov 13 13:32:47 2018 +0100
committer Commit Bot <commit-bot@chromium.org> Tue Nov 13 16:18:31 2018 +0000
tree c34e74229daf3bd94cce3a1c557178bb63805421
parent df15af47303ffafad009f865bc80679b453eef1b

gen.py: Remove UpdateLinuxSysroot()

This function is unused after commit df15af47 ("Explicitly specify sysroot
for Linux and macOS"), which removed the only code path calling it.

Change-Id: I1a1e89cbea0856c07cd62282fd8fe167293c5280
Reviewed-on: https://gn-review.googlesource.com/c/3240
Reviewed-by: Petr Hosek <phosek@google.com>
Commit-Queue: Petr Hosek <phosek@google.com>

.gitignore

diff --git a/.gitignore b/.gitignore
index 455d57f..4c20aff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,7 +39,6 @@
 .gdb_history
 .gdbinit
 .landmines
-.linux-sysroot/
 .metadata
 .project
 .pydevproject

build/gen.py

diff --git a/build/gen.py b/build/gen.py
index aa99775..fde6ced 100755
--- a/build/gen.py
+++ b/build/gen.py
@@ -11,11 +11,9 @@
 import os
 import platform
 import re
-import shutil
 import subprocess
 import sys
 import tempfile
-import urllib2
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
 REPO_ROOT = os.path.dirname(SCRIPT_DIR)
@@ -143,50 +141,6 @@
       f.write(contents)
 
 
-def UpdateLinuxSysroot():
-  # Sysroot revision from:
-  # https://cs.chromium.org/chromium/src/build/linux/sysroot_scripts/sysroots.json
-  server = 'https://commondatastorage.googleapis.com'
-  path = 'chrome-linux-sysroot/toolchain'
-  revision = '1015a998c2adf188813cca60b558b0ea1a0b6ced'
-  filename = 'debian_sid_amd64_sysroot.tar.xz'
-
-  url = '%s/%s/%s/%s' % (server, path, revision, filename)
-
-  sysroot = os.path.join(SCRIPT_DIR, os.pardir, '.linux-sysroot')
-
-  stamp = os.path.join(sysroot, '.stamp')
-  if os.path.exists(stamp):
-    with open(stamp) as s:
-      if s.read() == url:
-        return sysroot
-
-  print 'Installing Debian root image from %s' % url
-
-  if os.path.isdir(sysroot):
-    shutil.rmtree(sysroot)
-  os.mkdir(sysroot)
-  tarball = os.path.join(sysroot, filename)
-  print 'Downloading %s' % url
-
-  for _ in range(3):
-    response = urllib2.urlopen(url)
-    with open(tarball, 'wb') as f:
-      f.write(response.read())
-    break
-  else:
-    raise Exception('Failed to download %s' % url)
-
-  subprocess.check_call(['tar', 'xf', tarball, '-C', sysroot])
-
-  os.remove(tarball)
-
-  with open(stamp, 'w') as s:
-    s.write(url)
-
-  return sysroot
-
-
 def WriteGenericNinja(path, static_libraries, executables,
                       cc, cxx, ar, ld, platform, host, options,
                       cflags=[], cflags_cc=[], ldflags=[], libflags=[],