diff options
| author | ch.dumez@sisa.samsung.com <ch.dumez@sisa.samsung.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-29 03:09:45 +0000 |
|---|---|---|
| committer | ch.dumez@sisa.samsung.com <ch.dumez@sisa.samsung.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-29 03:09:45 +0000 |
| commit | 5de189ab9559f589eebce0c4420d11b91c9b4a7e (patch) | |
| tree | 13a10ef7e1352cec54b508372562f02ef4d92467 /build/install-build-deps-android.sh | |
| parent | bf0d26b24a61b36fca385adb6536e5f375be074e (diff) | |
| download | chromium_src-5de189ab9559f589eebce0c4420d11b91c9b4a7e.zip chromium_src-5de189ab9559f589eebce0c4420d11b91c9b4a7e.tar.gz chromium_src-5de189ab9559f589eebce0c4420d11b91c9b4a7e.tar.bz2 | |
install-build-deps-android.sh complains about missing ant-1.8
install-build-deps-android.sh complains about missing ant-1.8 on Ubuntu
13.04. The package is simply called "ant" since Ubuntu 12.04. The script
is checking for Ubuntu 12.x but fails to identify 13.x. This patch fixes
the script so that "ant" package is installed on Ubuntu >= 12.x, instead
of "ant-1.8".
Review URL: https://chromiumcodereview.appspot.com/23426002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@220169 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/install-build-deps-android.sh')
| -rwxr-xr-x | build/install-build-deps-android.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/build/install-build-deps-android.sh b/build/install-build-deps-android.sh index f6b445b..9417b1a 100755 --- a/build/install-build-deps-android.sh +++ b/build/install-build-deps-android.sh @@ -49,8 +49,8 @@ sudo apt-get -y install lighttpd python-pexpect xvfb x11-utils # Few binaries in the Android SDK require 32-bit libraries on the host. sudo apt-get -y install lib32z1 g++-multilib -if /usr/bin/lsb_release -r -s | grep -q "12."; then - # Ubuntu 12.x +if [ $(/usr/bin/lsb_release -r -s | cut -d"." -f1) -ge 12 ]; then + # Ubuntu >= 12.x sudo apt-get -y install ant # Java can not be installed via ppa on Ubuntu 12.04+ so we'll |