diff options
| author | jamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-17 16:50:56 +0000 |
|---|---|---|
| committer | jamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-17 16:50:56 +0000 |
| commit | 9a5bb05bd1e76b7923382dc058ca958818febce3 (patch) | |
| tree | a192c51fde864453816cdd9465331a57e1c66443 /build/common.gypi | |
| parent | b8faca2407cf7e3692d7ce9ff0a7aafc9a76cae1 (diff) | |
| download | chromium_src-9a5bb05bd1e76b7923382dc058ca958818febce3.zip chromium_src-9a5bb05bd1e76b7923382dc058ca958818febce3.tar.gz chromium_src-9a5bb05bd1e76b7923382dc058ca958818febce3.tar.bz2 | |
Revert accidental dartium code push
This reverts r264517 to r264538 from terry@google.com
BUG=none
TEST=none
NOTRY=true
NOTREECHECKS=true
TBR=terry@google.com
Review URL: https://codereview.chromium.org/239993009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@264545 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/common.gypi')
| -rw-r--r-- | build/common.gypi | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/build/common.gypi b/build/common.gypi index d156799..ebec615 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -420,7 +420,7 @@ 'enable_extensions%': 1, # Enable Google Now. - 'enable_google_now%': 0, + 'enable_google_now%': 1, # Enable printing support and UI. This variable is used to configure # which parts of printing will be built. 0 disables printing completely, @@ -1148,7 +1148,7 @@ # 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%': 'false', + 'win_third_party_warn_as_error%': 'true', # Clang stuff. 'clang%': '<(clang)', @@ -2727,7 +2727,6 @@ }], [ 'OS=="mac" or OS=="ios"', { 'xcode_settings': { - 'GCC_TREAT_WARNINGS_AS_ERRORS': 'NO', 'WARNING_CFLAGS!': ['-Wall', '-Wextra'], }, 'conditions': [ |