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

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

Issue 2721023003: Add bsdiff to //build/install-build-deps-android.sh. (Closed)
Patch Set: Created 3 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 »
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 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
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
69 69
70 # Required for apk-patch-size-estimator
71 sudo apt-get -y install bsdiff
72
70 # Install openjdk and openjre stuff 73 # Install openjdk and openjre stuff
71 sudo apt-get -y install $java_pkgs 74 sudo apt-get -y install $java_pkgs
72 75
73 # Switch version of Java to openjdk 7. 76 # Switch version of Java to openjdk 7.
74 # Some Java plugins (e.g. for firefox, mozilla) are not required to build, and 77 # Some Java plugins (e.g. for firefox, mozilla) are not required to build, and
75 # thus are treated only as warnings. Any errors in updating java alternatives 78 # thus are treated only as warnings. Any errors in updating java alternatives
76 # which are not '*-javaplugin.so' will cause errors and stop the script from 79 # which are not '*-javaplugin.so' will cause errors and stop the script from
77 # completing successfully. 80 # completing successfully.
78 if ! sudo update-java-alternatives -s $java_alternative \ 81 if ! sudo update-java-alternatives -s $java_alternative \
79 >& "${TEMPDIR}"/update-java-alternatives.out 82 >& "${TEMPDIR}"/update-java-alternatives.out
(...skipping 11 matching lines...) Expand all
91 >& /dev/null 94 >& /dev/null
92 then 95 then
93 # If there are non-javaplugin.so errors, treat as errors and exit 96 # If there are non-javaplugin.so errors, treat as errors and exit
94 echo 'ERRORS: Failed to update alternatives for java-6-sun:' 97 echo 'ERRORS: Failed to update alternatives for java-6-sun:'
95 grep -v 'javaplugin.so' "${TEMPDIR}"/update-java-alternatives.out 98 grep -v 'javaplugin.so' "${TEMPDIR}"/update-java-alternatives.out
96 exit 1 99 exit 1
97 fi 100 fi
98 fi 101 fi
99 102
100 echo "install-build-deps-android.sh complete." 103 echo "install-build-deps-android.sh complete."
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698