diff options
author | scottmg@google.com <scottmg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-24 16:16:14 +0000 |
---|---|---|
committer | scottmg@google.com <scottmg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-24 16:16:14 +0000 |
commit | 225507326ae5af8f9cf644aaee91174bd0e3602d (patch) | |
tree | 2108e1488abb98f566a8c56c386d22f2b1ba0978 | |
parent | f697903c60e1d151b9c4b81c571fce356ee702f0 (diff) | |
download | chromium_src-225507326ae5af8f9cf644aaee91174bd0e3602d.zip chromium_src-225507326ae5af8f9cf644aaee91174bd0e3602d.tar.gz chromium_src-225507326ae5af8f9cf644aaee91174bd0e3602d.tar.bz2 |
Revert 153092 - Turn on warnings as errors for (most) third_party code on Windows
Is causing warnings for Official build in PDF code. Boo.
-----------------
Can't quite be fully enabled yet due to not-yet-fixed third party
dependencies. Without it enabled, other packages regress while we're fixing
things. So, add a flag for now so warnings-freeness can be ratcheted forward
by having it on for most packages, but off for a few.
Also, disable warning in qcms (fixed upstream by a large refactoring, not
worth rolling for), and disable two minor warnings in yasm (patch posted
upstream for a few months, but maintainer does not seem motivated to merge).
Fix release-only warning in leveldatabase/env_chromium.cc. Was calling exit(1)
in a leaky destructor.
Fix a warning in lzma_sdk (missing an include).
Disable a silly warning in Release builds of skia and memory_watcher (that
/GS is not working because optimization is disabled).
Warning are currently tolerated in libvpx and mesa.
Cannot be committed until http://chromiumcodereview.appspot.com/10823426/ has
landed.
R=thakis@chromium.org
BUG=126483,140121, 143877
TEST=
Review URL: https://chromiumcodereview.appspot.com/10827429
TBR=scottmg@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10872063
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@153223 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r-- | DEPS | 2 | ||||
-rw-r--r-- | build/common.gypi | 10 | ||||
-rw-r--r-- | skia/skia.gyp | 2 | ||||
-rw-r--r-- | third_party/leveldatabase/env_chromium.cc | 3 | ||||
-rw-r--r-- | third_party/lzma_sdk/CpuArch.h | 1 | ||||
-rw-r--r-- | third_party/lzma_sdk/README.chromium | 3 | ||||
-rw-r--r-- | third_party/mesa/mesa.gyp | 3 | ||||
-rw-r--r-- | third_party/qcms/qcms.gyp | 3 | ||||
-rw-r--r-- | third_party/yasm/yasm.gyp | 3 | ||||
-rw-r--r-- | tools/memory_watcher/memory_watcher.gyp | 4 |
10 files changed, 5 insertions, 29 deletions
@@ -20,7 +20,7 @@ vars = { "libjingle_revision": "170", "libphonenumber_revision": "456", - "libvpx_revision": "152423", + "libvpx_revision": "150392", "lss_revision": "11", # These two FFmpeg variables must be updated together. One is used for SVN diff --git a/build/common.gypi b/build/common.gypi index 61310cb..734fa13 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -710,14 +710,6 @@ # to get incremental linking to be faster in debug builds. 'incremental_chrome_dll%': '0', - # The default settings for third party code for treating - # warnings-as-errors. Ideally, this would not be required, however there - # is some third party code that takes a long time to fix/roll. So, this - # flag allows us to have warnings as errors in general to prevent - # regressions in most modules, while working on the bits that are - # remaining. - 'win_third_party_warn_as_error%': 'true', - # This is the location of the sandbox binary. Chrome looks for this before # running the zygote process. If found, and SUID, it will be used to # sandbox the zygote process and, thus, all renderer processes. @@ -1685,7 +1677,7 @@ 'msvs_settings': { 'VCCLCompilerTool': { 'WarningLevel': '3', - 'WarnAsError': '<(win_third_party_warn_as_error)', + 'WarnAsError': 'false', # TODO(maruel): Enable it. 'Detect64BitPortabilityProblems': 'false', }, }, diff --git a/skia/skia.gyp b/skia/skia.gyp index 0ae1c0e..1615a3c 100644 --- a/skia/skia.gyp +++ b/skia/skia.gyp @@ -207,7 +207,7 @@ '../third_party/skia/src/sfnt', '../third_party/skia/src/utils', ], - 'msvs_disabled_warnings': [4244, 4267, 4341, 4345, 4390, 4554, 4748, 4800], + 'msvs_disabled_warnings': [4244, 4267, 4341, 4345, 4390, 4554, 4800], 'defines': [ 'SK_GAMMA_SRGB', #'SK_GAMMA_APPLY_TO_A8', diff --git a/third_party/leveldatabase/env_chromium.cc b/third_party/leveldatabase/env_chromium.cc index d1b4c26..6056de4 100644 --- a/third_party/leveldatabase/env_chromium.cc +++ b/third_party/leveldatabase/env_chromium.cc @@ -252,7 +252,8 @@ class ChromiumEnv : public Env { public: ChromiumEnv(); virtual ~ChromiumEnv() { - NOTREACHED(); + fprintf(stderr, "Destroying Env::Default()\n"); + exit(1); } virtual Status NewSequentialFile(const std::string& fname, diff --git a/third_party/lzma_sdk/CpuArch.h b/third_party/lzma_sdk/CpuArch.h index 8c0c84d..01930c7 100644 --- a/third_party/lzma_sdk/CpuArch.h +++ b/third_party/lzma_sdk/CpuArch.h @@ -4,7 +4,6 @@ #ifndef __CPU_ARCH_H #define __CPU_ARCH_H -#include <stdlib.h> #include "Types.h" EXTERN_C_BEGIN diff --git a/third_party/lzma_sdk/README.chromium b/third_party/lzma_sdk/README.chromium index c9ea02f..d487eec 100644 --- a/third_party/lzma_sdk/README.chromium +++ b/third_party/lzma_sdk/README.chromium @@ -14,6 +14,3 @@ proper file paths and generate a static lib. The patch in chromium.patch was applied to CpuArch.c to fix compile error on 32bit Linux. - -An #include <stdlib.h> needs to be added to CpuArch.h to avoid a warning on -Win32. diff --git a/third_party/mesa/mesa.gyp b/third_party/mesa/mesa.gyp index a7e475d..1ed392c 100644 --- a/third_party/mesa/mesa.gyp +++ b/third_party/mesa/mesa.gyp @@ -4,9 +4,6 @@ { 'variables': { - # Disable warnings as errors for mesa until they're fixed or disabled. - # http://crbug.com/143877 - 'win_third_party_warn_as_error': 'false', }, 'target_defaults': { 'conditions': [ diff --git a/third_party/qcms/qcms.gyp b/third_party/qcms/qcms.gyp index 0208b1e..01b9543 100644 --- a/third_party/qcms/qcms.gyp +++ b/third_party/qcms/qcms.gyp @@ -26,9 +26,6 @@ './src', ], }, - # Warning (sign-conversion) fixed upstream by large refactoring. Can be - # removed on next roll. - 'msvs_disabled_warnings': [ 4018 ], 'conditions': [ [ 'target_arch != "arm" and OS in ["linux", "freebsd", "openbsd", "solaris"]', { 'cflags': [ diff --git a/third_party/yasm/yasm.gyp b/third_party/yasm/yasm.gyp index 9093600..d981b50 100644 --- a/third_party/yasm/yasm.gyp +++ b/third_party/yasm/yasm.gyp @@ -71,9 +71,6 @@ 'genstring', 're2c', ], - # Patch to fix posted upstream, but not yet merged. - # https://github.com/yasm/yasm/pull/64 - 'msvs_disabled_warnings': [ 4018, 4090 ], 'sources': [ 'source/patched-yasm/frontends/yasm/yasm-options.c', 'source/patched-yasm/frontends/yasm/yasm.c', diff --git a/tools/memory_watcher/memory_watcher.gyp b/tools/memory_watcher/memory_watcher.gyp index eb19705..feed6f8 100644 --- a/tools/memory_watcher/memory_watcher.gyp +++ b/tools/memory_watcher/memory_watcher.gyp @@ -18,10 +18,6 @@ '../..', '<(DEPTH)/third_party/wtl/include', ], - # "/GS can not protect parameters and local variables from local buffer - # overrun because optimizations are disabled in function". Nothing to be - # done about this warning. - 'msvs_disabled_warnings': [ 4748 ], 'sources': [ 'call_stack.cc', 'call_stack.h', |