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

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

Issue 1418573010: Enable downloading Google Play services via deps hook (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase on master Created 5 years, 1 month 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 | « build/install-android-sdks.sh ('k') | build/secondary/third_party/android_tools/BUILD.gn » ('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 http://code.google.com/p/chromium/wiki/AndroidBuildInstructions 9 # See http://code.google.com/p/chromium/wiki/AndroidBuildInstructions
10 10
11 # This script installs the sun-java6 packages (bin, jre and jdk). Sun requires 11 # This script installs the sun-java6 packages (bin, jre and jdk). Sun requires
12 # a license agreement, so upon installation it will prompt the user. To get 12 # a license agreement, so upon installation it will prompt the user. To get
13 # past the curses-based dialog press TAB <ret> TAB <ret> to agree. 13 # past the curses-based dialog press TAB <ret> TAB <ret> to agree.
14 14
15 args="$@" 15 args="$@"
16
17 # TODO(dgn) remove this this argument from calls (http://crbug.com/541727)
16 if test "$1" = "--skip-sdk-packages"; then 18 if test "$1" = "--skip-sdk-packages"; then
17 skip_inst_sdk_packages=1
18 args="${@:2}" 19 args="${@:2}"
19 else
20 skip_inst_sdk_packages=0
21 fi 20 fi
22 21
23 if ! uname -m | egrep -q "i686|x86_64"; then 22 if ! uname -m | egrep -q "i686|x86_64"; then
24 echo "Only x86 architectures are currently supported" >&2 23 echo "Only x86 architectures are currently supported" >&2
25 exit 24 exit
26 fi 25 fi
27 26
28 # Install first the default Linux build deps. 27 # Install first the default Linux build deps.
29 "$(dirname "${BASH_SOURCE[0]}")/install-build-deps.sh" \ 28 "$(dirname "${BASH_SOURCE[0]}")/install-build-deps.sh" \
30 --no-syms --lib32 --no-arm --no-chromeos-fonts --no-nacl --no-prompt "${args}" 29 --no-syms --lib32 --no-arm --no-chromeos-fonts --no-nacl --no-prompt "${args}"
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 if grep -v 'javaplugin.so' "${TEMPDIR}"/update-java-alternatives.out \ 84 if grep -v 'javaplugin.so' "${TEMPDIR}"/update-java-alternatives.out \
86 >& /dev/null 85 >& /dev/null
87 then 86 then
88 # If there are non-javaplugin.so errors, treat as errors and exit 87 # If there are non-javaplugin.so errors, treat as errors and exit
89 echo 'ERRORS: Failed to update alternatives for java-6-sun:' 88 echo 'ERRORS: Failed to update alternatives for java-6-sun:'
90 grep -v 'javaplugin.so' "${TEMPDIR}"/update-java-alternatives.out 89 grep -v 'javaplugin.so' "${TEMPDIR}"/update-java-alternatives.out
91 exit 1 90 exit 1
92 fi 91 fi
93 fi 92 fi
94 93
95 # Install SDK packages for android
96 if test "$skip_inst_sdk_packages" != 1; then
97 "$(dirname "${BASH_SOURCE[0]}")/install-android-sdks.sh"
98 fi
99
100 echo "install-build-deps-android.sh complete." 94 echo "install-build-deps-android.sh complete."
OLDNEW
« no previous file with comments | « build/install-android-sdks.sh ('k') | build/secondary/third_party/android_tools/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698