Fix android build deps to work on ubuntu 12.04+

Fix android build deps to work on ubuntu 12.04+


BUG=


Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=158902

[Peter Beverloo, 2012-09-21 20:01:46]

Hi Greg, a few minor nits. Thank you!!

http://codereview.chromium.org/10963014/diff/1/build/install-build-deps-andro...
File build/install-build-deps-android.sh (right):

http://codereview.chromium.org/10963014/diff/1/build/install-build-deps-andro...
build/install-build-deps-android.sh:46: if /usr/bin/lsb_release -r -s | egrep -q
"12."; then
There's no regular expression in here, so we can use "grep" instead.

http://codereview.chromium.org/10963014/diff/1/build/install-build-deps-andro...
build/install-build-deps-android.sh:48: sudo apt-get -y install python-pexpect
ant xvfb x11-utils
The python-pexpect, xvfb and x11-utils packages are also installed on line 65.
Could we move these to a shared apt-get call on line 45 to avoid duplication?
That way only "apt" (for 12.x) and "apt1.8" (for others) have to be in the
conditional.

http://codereview.chromium.org/10963014/diff/1/build/install-build-deps-andro...
build/install-build-deps-android.sh:54: if ! java -version 2>&1 | egrep -q
"Java\(TM\)"; then
This can be "grep" as well, then you don't have to escape the parenthesis
either.

[gregsimon, 2012-09-25 19:26:08]

On 2012/09/21 20:01:46, Peter Beverloo wrote:
> Hi Greg, a few minor nits. Thank you!!
> 
>
http://codereview.chromium.org/10963014/diff/1/build/install-build-deps-andro...
> File build/install-build-deps-android.sh (right):
> 
>
http://codereview.chromium.org/10963014/diff/1/build/install-build-deps-andro...
> build/install-build-deps-android.sh:46: if /usr/bin/lsb_release -r -s | egrep
-q
> "12."; then
> There's no regular expression in here, so we can use "grep" instead.
> 
>
http://codereview.chromium.org/10963014/diff/1/build/install-build-deps-andro...
> build/install-build-deps-android.sh:48: sudo apt-get -y install python-pexpect
> ant xvfb x11-utils
> The python-pexpect, xvfb and x11-utils packages are also installed on line 65.
> Could we move these to a shared apt-get call on line 45 to avoid duplication?
> That way only "apt" (for 12.x) and "apt1.8" (for others) have to be in the
> conditional.
> 
>
http://codereview.chromium.org/10963014/diff/1/build/install-build-deps-andro...
> build/install-build-deps-android.sh:54: if ! java -version 2>&1 | egrep -q
> "Java\(TM\)"; then
> This can be "grep" as well, then you don't have to escape the parenthesis
> either.

Great -- just uploaded a new patch which addresses the issues you brought up.

[Peter Beverloo, 2012-09-25 20:19:09]

lgtm, thanks!

[commit-bot: I haz the power, 2012-09-26 16:31:10]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/gregsimon@chromium.org/10963014/3001

[commit-bot: I haz the power, 2012-09-26 20:09:31]

Retried try job too often for step(s) browser_tests

[commit-bot: I haz the power, 2012-09-26 20:12:14]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/gregsimon@chromium.org/10963014/3001

[commit-bot: I haz the power, 2012-09-26 21:47:08]

Change committed as 158902