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

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

Issue 578503002: Pass on the unsupported option to install-build-deps.sh if supplied during android deps install. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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 that 7 # Script to install everything needed to build chromium on android that
8 # requires sudo privileges. 8 # requires 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 if ! uname -m | egrep -q "i686|x86_64"; then 15 if ! uname -m | egrep -q "i686|x86_64"; then
16 echo "Only x86 architectures are currently supported" >&2 16 echo "Only x86 architectures are currently supported" >&2
17 exit 17 exit
18 fi 18 fi
19 19
20 # Install first the default Linux build deps. 20 # Install first the default Linux build deps.
21 "$(dirname "${BASH_SOURCE[0]}")/install-build-deps.sh" \ 21 "$(dirname "${BASH_SOURCE[0]}")/install-build-deps.sh" \
22 --no-syms --no-arm --no-chromeos-fonts --no-nacl --no-prompt 22 --no-syms --no-arm --no-chromeos-fonts --no-nacl --no-prompt $@
Primiano Tucci (use gerrit) 2014/09/16 16:47:06 In general what you really want is "$@" which, con
23 23
24 # The temporary directory used to store output of update-java-alternatives 24 # The temporary directory used to store output of update-java-alternatives
25 TEMPDIR=$(mktemp -d) 25 TEMPDIR=$(mktemp -d)
26 cleanup() { 26 cleanup() {
27 local status=${?} 27 local status=${?}
28 trap - EXIT 28 trap - EXIT
29 rm -rf "${TEMPDIR}" 29 rm -rf "${TEMPDIR}"
30 exit ${status} 30 exit ${status}
31 } 31 }
32 trap cleanup EXIT 32 trap cleanup EXIT
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 >& /dev/null 78 >& /dev/null
79 then 79 then
80 # If there are non-javaplugin.so errors, treat as errors and exit 80 # If there are non-javaplugin.so errors, treat as errors and exit
81 echo 'ERRORS: Failed to update alternatives for java-6-sun:' 81 echo 'ERRORS: Failed to update alternatives for java-6-sun:'
82 grep -v 'javaplugin.so' "${TEMPDIR}"/update-java-alternatives.out 82 grep -v 'javaplugin.so' "${TEMPDIR}"/update-java-alternatives.out
83 exit 1 83 exit 1
84 fi 84 fi
85 fi 85 fi
86 86
87 echo "install-build-deps-android.sh complete." 87 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