third_party/instrumented_libraries/scripts/install-build-deps.sh - Issue 1018043007: Instrumented libraries: fix install-build-deps.sh

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: third_party/instrumented_libraries/scripts/install-build-deps.sh

Issue 1018043007: Instrumented libraries: fix install-build-deps.sh (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

« no previous file with comments | « no previous file | no next file » | no next file with comments »

OLD	NEW
1 #!/bin/bash -e	1 #!/bin/bash -e

2	2

3 # Copyright 2014 The Chromium Authors. All rights reserved.	3 # Copyright 2014 The Chromium Authors. All rights reserved.

4 # Use of this source code is governed by a BSD-style license that can be	4 # Use of this source code is governed by a BSD-style license that can be

5 # found in the LICENSE file.	5 # found in the LICENSE file.

6	6

7 # Script to install build dependencies of packages which we instrument.	7 # Script to install build dependencies of packages which we instrument.

8	8

9 # Enable source repositories in Goobuntu.	9 # Enable source repositories in Goobuntu.

10 if hash goobuntu-config 2> /dev/null	10 if hash goobuntu-config 2> /dev/null

(...skipping 76 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
87	87

88 sudo apt-get build-dep -y $packages	88 sudo apt-get build-dep -y $packages

89	89

90 if test "$ubuntu_release" = "trusty" ; then	90 if test "$ubuntu_release" = "trusty" ; then

91 # On Trusty, build deps for some of the instrumented packages above conflict	91 # On Trusty, build deps for some of the instrumented packages above conflict

92 # with Chromium's build deps. In particular:	92 # with Chromium's build deps. In particular:

93 # zlib1g and libffi remove gcc-4.8 in favor of gcc-multilib,	93 # zlib1g and libffi remove gcc-4.8 in favor of gcc-multilib,

94 # libglib2.0-0 removes libelf in favor of libelfg0.	94 # libglib2.0-0 removes libelf in favor of libelfg0.

95 # We let Chromium's build deps take priority. So, run Chromium's	95 # We let Chromium's build deps take priority. So, run Chromium's

96 # install-build-deps.sh to reinstall those that have been removed.	96 # install-build-deps.sh to reinstall those that have been removed.

97 $(dirname ${BASH_SOURCE[0]})/../../build/install-build-deps.sh --no-prompt	97 $(dirname ${BASH_SOURCE[0]})/../../../build/install-build-deps.sh --no-prompt

98 fi	98 fi

OLD	NEW