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: http://src.chromium.org/svn/trunk/src/build@220169 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
This commit is contained in:
ch.dumez@sisa.samsung.com 2013-08-29 03:09:45 +00:00
Родитель d604177c65
Коммит 4826cc5cee
1 изменённых файлов: 2 добавлений и 2 удалений

Просмотреть файл

@ -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