| OLD | NEW |
| 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 |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 42 # This step differs depending on what Ubuntu release we are running | 42 # This step differs depending on what Ubuntu release we are running |
| 43 # on since the package names are different, and Sun's Java must | 43 # on since the package names are different, and Sun's Java must |
| 44 # be installed manually on late-model versions. | 44 # be installed manually on late-model versions. |
| 45 | 45 |
| 46 # common | 46 # common |
| 47 sudo apt-get -y install lighttpd python-pexpect xvfb x11-utils | 47 sudo apt-get -y install lighttpd python-pexpect xvfb x11-utils |
| 48 | 48 |
| 49 # Few binaries in the Android SDK require 32-bit libraries on the host. | 49 # Few binaries in the Android SDK require 32-bit libraries on the host. |
| 50 sudo apt-get -y install lib32z1 g++-multilib | 50 sudo apt-get -y install lib32z1 g++-multilib |
| 51 | 51 |
| 52 if /usr/bin/lsb_release -r -s | grep -q "12."; then | 52 if [ $(/usr/bin/lsb_release -r -s | cut -d"." -f1) -ge 12 ]; then |
| 53 # Ubuntu 12.x | 53 # Ubuntu >= 12.x |
| 54 sudo apt-get -y install ant | 54 sudo apt-get -y install ant |
| 55 | 55 |
| 56 # Java can not be installed via ppa on Ubuntu 12.04+ so we'll | 56 # Java can not be installed via ppa on Ubuntu 12.04+ so we'll |
| 57 # simply check to see if it has been setup properly -- if not | 57 # simply check to see if it has been setup properly -- if not |
| 58 # let the user know. | 58 # let the user know. |
| 59 | 59 |
| 60 if ! java -version 2>&1 | grep -q "Java(TM)"; then | 60 if ! java -version 2>&1 | grep -q "Java(TM)"; then |
| 61 echo "****************************************************************" | 61 echo "****************************************************************" |
| 62 echo "You need to install the Oracle Java SDK from http://goo.gl/uPRSq" | 62 echo "You need to install the Oracle Java SDK from http://goo.gl/uPRSq" |
| 63 echo "and configure it as the default command-line Java environment." | 63 echo "and configure it as the default command-line Java environment." |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 95 then | 95 then |
| 96 # 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 |
| 97 echo 'ERRORS: Failed to update alternatives for java-6-sun:' | 97 echo 'ERRORS: Failed to update alternatives for java-6-sun:' |
| 98 grep -v 'javaplugin.so' "${TEMPDIR}"/update-java-alternatives.out | 98 grep -v 'javaplugin.so' "${TEMPDIR}"/update-java-alternatives.out |
| 99 exit 1 | 99 exit 1 |
| 100 fi | 100 fi |
| 101 fi | 101 fi |
| 102 fi | 102 fi |
| 103 | 103 |
| 104 echo "install-build-deps-android.sh complete." | 104 echo "install-build-deps-android.sh complete." |
| OLD | NEW |