| 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 24 matching lines...) Expand all  Loading... | 
|  35  |  35  | 
|  36 # Fix deps |  36 # Fix deps | 
|  37 sudo apt-get -f install |  37 sudo apt-get -f install | 
|  38  |  38  | 
|  39 # Install deps |  39 # Install deps | 
|  40 # This step differs depending on what Ubuntu release we are running |  40 # This step differs depending on what Ubuntu release we are running | 
|  41 # on since the package names are different, and Sun's Java must |  41 # on since the package names are different, and Sun's Java must | 
|  42 # be installed manually on late-model versions. |  42 # be installed manually on late-model versions. | 
|  43  |  43  | 
|  44 # common |  44 # common | 
|  45 sudo apt-get -y install checkstyle lighttpd python-pexpect xvfb x11-utils |  45 sudo apt-get -y install lighttpd python-pexpect xvfb x11-utils | 
|  46  |  46  | 
|  47 # Few binaries in the Android SDK require 32-bit libraries on the host. |  47 # Few binaries in the Android SDK require 32-bit libraries on the host. | 
|  48 sudo apt-get -y install lib32z1 g++-multilib |  48 sudo apt-get -y install lib32z1 g++-multilib | 
|  49  |  49  | 
|  50 sudo apt-get -y install ant |  50 sudo apt-get -y install ant | 
|  51  |  51  | 
|  52 # Install openjdk and openjre 7 stuff |  52 # Install openjdk and openjre 7 stuff | 
|  53 sudo apt-get -y install openjdk-7-jre openjdk-7-jdk |  53 sudo apt-get -y install openjdk-7-jre openjdk-7-jdk | 
|  54  |  54  | 
|  55 # Switch version of Java to openjdk 7. |  55 # Switch version of Java to openjdk 7. | 
| (...skipping 17 matching lines...) Expand all  Loading... | 
|  73       >& /dev/null |  73       >& /dev/null | 
|  74   then |  74   then | 
|  75     # If there are non-javaplugin.so errors, treat as errors and exit |  75     # If there are non-javaplugin.so errors, treat as errors and exit | 
|  76     echo 'ERRORS: Failed to update alternatives for java-6-sun:' |  76     echo 'ERRORS: Failed to update alternatives for java-6-sun:' | 
|  77     grep -v 'javaplugin.so' "${TEMPDIR}"/update-java-alternatives.out |  77     grep -v 'javaplugin.so' "${TEMPDIR}"/update-java-alternatives.out | 
|  78     exit 1 |  78     exit 1 | 
|  79   fi |  79   fi | 
|  80 fi |  80 fi | 
|  81  |  81  | 
|  82 echo "install-build-deps-android.sh complete." |  82 echo "install-build-deps-android.sh complete." | 
| OLD | NEW |