Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(29)

Side by Side Diff: build/install-build-deps-android.sh

Issue 2547253002: Add lib32z1 to install-build-deps-android.sh (Closed)
Patch Set: Created 4 years 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 | docs/android_build_instructions.md » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 #!/bin/bash -e 1 #!/bin/bash -e
2 2
3 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 3 # Copyright (c) 2012 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 everything needed to build chromium on android, including 7 # Script to install everything needed to build chromium on android, including
8 # items requiring sudo privileges. 8 # items requiring sudo privileges.
9 # See https://www.chromium.org/developers/how-tos/android-build-instructions 9 # See https://www.chromium.org/developers/how-tos/android-build-instructions
10 10
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 48
49 # Fix deps 49 # Fix deps
50 sudo apt-get -f install 50 sudo apt-get -f install
51 51
52 # Install deps 52 # Install deps
53 # This step differs depending on what Ubuntu release we are running 53 # This step differs depending on what Ubuntu release we are running
54 # on since the package names are different, and Sun's Java must 54 # on since the package names are different, and Sun's Java must
55 # be installed manually on late-model versions. 55 # be installed manually on late-model versions.
56 56
57 # common 57 # common
58 sudo apt-get -y install lighttpd python-pexpect xvfb x11-utils 58 sudo apt-get -y install lib32z1 lighttpd python-pexpect xvfb x11-utils
59 59
60 # Some binaries in the Android SDK require 32-bit libraries on the host. 60 # Some binaries in the Android SDK require 32-bit libraries on the host.
61 # See https://developer.android.com/sdk/installing/index.html?pkg=tools 61 # See https://developer.android.com/sdk/installing/index.html?pkg=tools
62 if [[ $lsb_release == "precise" ]]; then 62 if [[ $lsb_release == "precise" ]]; then
63 sudo apt-get -y install ia32-libs 63 sudo apt-get -y install ia32-libs
64 else 64 else
65 sudo apt-get -y install libncurses5:i386 libstdc++6:i386 zlib1g:i386 65 sudo apt-get -y install libncurses5:i386 libstdc++6:i386 zlib1g:i386
66 fi 66 fi
67 67
68 sudo apt-get -y install ant 68 sudo apt-get -y install ant
(...skipping 22 matching lines...) Expand all
91 >& /dev/null 91 >& /dev/null
92 then 92 then
93 # If there are non-javaplugin.so errors, treat as errors and exit 93 # If there are non-javaplugin.so errors, treat as errors and exit
94 echo 'ERRORS: Failed to update alternatives for java-6-sun:' 94 echo 'ERRORS: Failed to update alternatives for java-6-sun:'
95 grep -v 'javaplugin.so' "${TEMPDIR}"/update-java-alternatives.out 95 grep -v 'javaplugin.so' "${TEMPDIR}"/update-java-alternatives.out
96 exit 1 96 exit 1
97 fi 97 fi
98 fi 98 fi
99 99
100 echo "install-build-deps-android.sh complete." 100 echo "install-build-deps-android.sh complete."
OLDNEW
« no previous file with comments | « no previous file | docs/android_build_instructions.md » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698