diff options
| author | primiano@chromium.org <primiano@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-03 21:40:19 +0000 |
|---|---|---|
| committer | primiano@chromium.org <primiano@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-03 21:40:19 +0000 |
| commit | 9e5f72814498e3abb42d92530192e2e1a5168c9a (patch) | |
| tree | 85c4b502a22e98570fd8f9c4ba9b7f34e1882f47 /build | |
| parent | 0525b1df606f47dfcafc5a1511b55f462a42d16e (diff) | |
| download | chromium_src-9e5f72814498e3abb42d92530192e2e1a5168c9a.zip chromium_src-9e5f72814498e3abb42d92530192e2e1a5168c9a.tar.gz chromium_src-9e5f72814498e3abb42d92530192e2e1a5168c9a.tar.bz2 | |
Call install-build-deps.sh from install-build-deps-android.sh
install-build-deps-android.sh relies on the assumption that
install-build-deps.sh has been previously invoked. At this point,
is makes sense for the Android script itself invoking its parent
dependency.
See chromium-dev discussion: http://goo.gl/dKDX3R
BUG=
NOTRY=true
Review URL: https://codereview.chromium.org/222183002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@261535 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rwxr-xr-x | build/install-build-deps-android.sh | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/build/install-build-deps-android.sh b/build/install-build-deps-android.sh index 73e534a..c3375ad 100755 --- a/build/install-build-deps-android.sh +++ b/build/install-build-deps-android.sh @@ -17,11 +17,9 @@ if ! uname -m | egrep -q "i686|x86_64"; then exit fi -if [ "x$(id -u)" != x0 ]; then - echo "Running as non-root user." - echo "You might have to enter your password one or more times for 'sudo'." - echo -fi +# Install first the default Linux build deps. +"$(dirname "${BASH_SOURCE[0]}")/install-build-deps.sh" \ + --no-syms --no-arm --no-chromeos-fonts --no-nacl --no-prompt # The temporary directory used to store output of update-java-alternatives TEMPDIR=$(mktemp -d) |