Bug 845711 - Fix EXTRA_GYP_DEFINES for arm on non-bash shells. r=ted

This commit is contained in:
Steven Lee 2013-02-27 15:44:34 +01:00
parent 6cc127e4bd
commit 723dee2ead

View File

@ -9029,9 +9029,9 @@ if test "${OS_TARGET}" = "WINNT"; then
elif test "${OS_TARGET}" = "Android"; then
EXTRA_GYP_DEFINES="-D gtest_target_type=executable -D android_toolchain=${android_toolchain} -G os=android "
if test -n "$ARM_ARCH" && test "$ARM_ARCH" -lt 7; then
EXTRA_GYP_DEFINES+=" -D armv7=0 "
EXTRA_GYP_DEFINES="${EXTRA_GYP_DEFINES} -D armv7=0 "
else
EXTRA_GYP_DEFINES+=" -D armv7=1 "
EXTRA_GYP_DEFINES="${EXTRA_GYP_DEFINES} -D armv7=1 "
fi
fi