Skip to content

Commit

Permalink
Remove support for Ubuntu/Precise sysroot
Browse files Browse the repository at this point in the history
BUG=564904

Review-Url: https://codereview.chromium.org/2596653002
Cr-Commit-Position: refs/heads/master@{#462884}
  • Loading branch information
sbc100 authored and Commit bot committed Apr 7, 2017
1 parent 95c2d08 commit bc51e87
Show file tree
Hide file tree
Showing 6 changed files with 2 additions and 412 deletions.
5 changes: 1 addition & 4 deletions build/experimental/install-build-deps.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@


SUPPORTED_UBUNTU_VERSIONS = (
{'number': '12.04', 'codename': 'precise'},
{'number': '14.04', 'codename': 'trusty'},
{'number': '14.10', 'codename': 'utopic'},
{'number': '15.04', 'codename': 'vivid'},
Expand Down Expand Up @@ -300,9 +299,7 @@ def compute_dynamic_package_lists():
lsb_codename = lsb_release_short_codename()

# Find the proper version of libstdc++6-4.x-dbg.
if lsb_codename == 'precise':
_packages_dbg += ('libstdc++6-4.6-dbg',)
elif lsb_codename == 'trusty':
if lsb_codename == 'trusty':
_packages_dbg += ('libstdc++6-4.8-dbg',)
else:
_packages_dbg += ('libstdc++6-4.9-dbg',)
Expand Down
6 changes: 1 addition & 5 deletions build/install-build-deps-android.sh
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,7 @@ sudo apt-get -y install lib32z1 lighttpd python-pexpect xvfb x11-utils

# Some binaries in the Android SDK require 32-bit libraries on the host.
# See https://developer.android.com/sdk/installing/index.html?pkg=tools
if [[ $lsb_release == "precise" ]]; then
sudo apt-get -y install ia32-libs
else
sudo apt-get -y install libncurses5:i386 libstdc++6:i386 zlib1g:i386
fi
sudo apt-get -y install libncurses5:i386 libstdc++6:i386 zlib1g:i386

# Required by //components/cronet/tools/generate_javadoc.py
# TODO(375324): Stop requiring ANT.
Expand Down
6 changes: 0 additions & 6 deletions build/linux/sysroot_scripts/install-sysroot.py
Original file line number Diff line number Diff line change
Expand Up @@ -122,12 +122,6 @@ def InstallDefaultSysroots(host_arch):
if host_arch == 'amd64':
InstallDefaultSysrootForArch('i386')

# Desktop Chromium OS builds require the precise sysroot.
# TODO(thomasanderson): only download this when the GN arg target_os
# == 'chromeos', when the functionality to perform the check becomes
# available.
InstallSysroot('Precise', 'amd64')

# If we can detect a non-standard target_arch such as ARM or MIPS,
# then install the sysroot too. Don't attempt to install arm64
# since this is currently and android-only architecture.
Expand Down
179 changes: 0 additions & 179 deletions build/linux/sysroot_scripts/packagelist.precise.amd64

This file was deleted.

Loading

0 comments on commit bc51e87

Please sign in to comment.