diff --git a/b2g/confvars.sh b/b2g/confvars.sh
index 23ade908bde..4d58bfbaa1d 100644
--- a/b2g/confvars.sh
+++ b/b2g/confvars.sh
@@ -59,6 +59,10 @@ MOZ_B2G=1
 if test "$OS_TARGET" = "Android"; then
 MOZ_NUWA_PROCESS=1
 MOZ_B2G_LOADER=1
+# Warnings-as-errors cannot be enabled on ICS builds due to bug 915555
+if test "$PLATFORM_SDK_VERSION" -gt 15; then
+MOZ_ENABLE_WARNINGS_AS_ERRORS=1
+fi
 fi
 
 MOZ_JSDOWNLOADS=1