Bug 703121 - Part 2 - Do not force warnings-as-errors to be disabled on Android. r=khuey
authorMounir Lamouri <mounir.lamouri@gmail.com>
Fri, 06 Jan 2012 18:17:07 +0100
changeset 85199 b281d54daedda7cb682875f05a4050c42678af88
parent 85198 08d24f493dc1ddc90fe5b788cc29b2f6c2834f0e
child 85200 701095bec70454bfbe8e6def6e7fc172c667afc2
push id805
push userakeybl@mozilla.com
push dateWed, 01 Feb 2012 18:17:35 +0000
treeherdermozilla-aurora@6fb3bf232436 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskhuey
bugs703121
milestone12.0a1
Bug 703121 - Part 2 - Do not force warnings-as-errors to be disabled on Android. r=khuey
config/config.mk
js/src/config/config.mk
--- a/config/config.mk
+++ b/config/config.mk
@@ -470,23 +470,16 @@ CXXFLAGS += $(MOZ_FRAMEPTR_FLAGS)
 # NOTE: First, we clear FAIL_ON_WARNINGS[_DEBUG] if we're doing a Windows PGO
 # build, since WARNINGS_AS_ERRORS has been suspected of causing isuses in that
 # situation. (See bug 437002.)
 ifeq (WINNT_1,$(OS_ARCH)_$(MOZ_PROFILE_GENERATE)$(MOZ_PROFILE_USE))
 FAIL_ON_WARNINGS_DEBUG=
 FAIL_ON_WARNINGS=
 endif # WINNT && (MOS_PROFILE_GENERATE ^ MOZ_PROFILE_USE)
 
-# Also clear FAIL_ON_WARNINGS[_DEBUG] for Android builds, since
-# they have some platform-specific warnings we haven't fixed yet.
-ifeq ($(OS_TARGET),Android)
-FAIL_ON_WARNINGS_DEBUG=
-FAIL_ON_WARNINGS=
-endif # Android
-
 # Now, check for debug version of flag; it turns on normal flag in debug builds.
 ifdef FAIL_ON_WARNINGS_DEBUG
 ifdef MOZ_DEBUG
 FAIL_ON_WARNINGS = 1
 endif # MOZ_DEBUG
 endif # FAIL_ON_WARNINGS_DEBUG
 
 # Check for normal version of flag, and add WARNINGS_AS_ERRORS if it's set to 1.
--- a/js/src/config/config.mk
+++ b/js/src/config/config.mk
@@ -470,23 +470,16 @@ CXXFLAGS += $(MOZ_FRAMEPTR_FLAGS)
 # NOTE: First, we clear FAIL_ON_WARNINGS[_DEBUG] if we're doing a Windows PGO
 # build, since WARNINGS_AS_ERRORS has been suspected of causing isuses in that
 # situation. (See bug 437002.)
 ifeq (WINNT_1,$(OS_ARCH)_$(MOZ_PROFILE_GENERATE)$(MOZ_PROFILE_USE))
 FAIL_ON_WARNINGS_DEBUG=
 FAIL_ON_WARNINGS=
 endif # WINNT && (MOS_PROFILE_GENERATE ^ MOZ_PROFILE_USE)
 
-# Also clear FAIL_ON_WARNINGS[_DEBUG] for Android builds, since
-# they have some platform-specific warnings we haven't fixed yet.
-ifeq ($(OS_TARGET),Android)
-FAIL_ON_WARNINGS_DEBUG=
-FAIL_ON_WARNINGS=
-endif # Android
-
 # Now, check for debug version of flag; it turns on normal flag in debug builds.
 ifdef FAIL_ON_WARNINGS_DEBUG
 ifdef MOZ_DEBUG
 FAIL_ON_WARNINGS = 1
 endif # MOZ_DEBUG
 endif # FAIL_ON_WARNINGS_DEBUG
 
 # Check for normal version of flag, and add WARNINGS_AS_ERRORS if it's set to 1.