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 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
63 if grep -v 'javaplugin.so' "${TEMPDIR}"/update-java-alternatives.out \ | 63 if grep -v 'javaplugin.so' "${TEMPDIR}"/update-java-alternatives.out \ |
64 >& /dev/null | 64 >& /dev/null |
65 then | 65 then |
66 # If there are non-javaplugin.so errors, treat as errors and exit | 66 # If there are non-javaplugin.so errors, treat as errors and exit |
67 echo 'ERRORS: Failed to update alternatives for java-6-sun:' | 67 echo 'ERRORS: Failed to update alternatives for java-6-sun:' |
68 grep -v 'javaplugin.so' "${TEMPDIR}"/update-java-alternatives.out | 68 grep -v 'javaplugin.so' "${TEMPDIR}"/update-java-alternatives.out |
69 exit 1 | 69 exit 1 |
70 fi | 70 fi |
71 fi | 71 fi |
72 | 72 |
73 # Install ant | 73 # Install ant 1.8 (default is 1.7). |
74 sudo apt-get install ant | 74 sudo apt-get install ant1.8 |
75 | 75 |
76 echo "install-build-deps-android.sh complete." | 76 echo "install-build-deps-android.sh complete." |
OLD | NEW |