From 073710992b41b986e08ed1147840f0d29c96b496 Mon Sep 17 00:00:00 2001
From: Abhishek Bhattacharya <babhishek21@yahoo.co.in>
Date: Sat, 17 Jan 2015 16:42:04 -0800
Subject: [PATCH] Bug 1119921 - Fix "$ANDROID_VERSION" comparison tests.
 r=nalexander

--HG--
extra : amend_source : 50fa678c38bac71807cd09991d1b4239b5f666b9
---
 build/autoconf/compiler-opts.m4 | 2 +-
 configure.in                    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build/autoconf/compiler-opts.m4 b/build/autoconf/compiler-opts.m4
index 55431687e4e..cb47cf749a9 100644
--- a/build/autoconf/compiler-opts.m4
+++ b/build/autoconf/compiler-opts.m4
@@ -334,7 +334,7 @@ fi
 # Even after dropping 10.6 support, MOZ_PIE would not be useful since it's the
 # default (and clang says the -pie option is not used).
 # On other Unix systems, some file managers (Nautilus) can't start PIE programs
-if test -n "$gonkdir" -a "$ANDROID_VERSION" -ge 16; then
+if test -n "$gonkdir" && test "$ANDROID_VERSION" -ge 16; then
     MOZ_PIE=1
 else
     MOZ_PIE=
diff --git a/configure.in b/configure.in
index 1fdae22ff3f..3ae34bd56ff 100644
--- a/configure.in
+++ b/configure.in
@@ -5085,7 +5085,7 @@ if test -n "$MOZ_WEBRTC"; then
 fi
 
 dnl Temporary until webrtc works on gonk-L
-if test -n "$gonkdir" -a "$ANDROID_VERSION" -ge 21; then
+if test -n "$gonkdir" && test "$ANDROID_VERSION" -ge 21; then
     MOZ_WEBRTC=
 fi