diff options
Diffstat (limited to 'build')
| -rw-r--r-- | build/all.gyp | 12 | ||||
| -rw-r--r-- | build/common.gypi | 5 |
2 files changed, 2 insertions, 15 deletions
diff --git a/build/all.gyp b/build/all.gyp index f95401a..651982f 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -243,18 +243,6 @@ ], }, # target_name: All_syzygy { - 'target_name': 'dartium_builder', - 'type': 'none', - 'dependencies': [ - '../dart/pkg/pkg.gyp:pkg_packages', - # '../webkit/webkit.gyp:pull_in_webkit_unit_tests', - '../chrome/chrome.gyp:chrome', - '../chrome/chrome.gyp:chromedriver', - '../content/content_shell_and_tests.gyp:content_shell', - 'blink_tests', - ], - }, - { # Note: Android uses android_builder_tests below. # TODO: Consider merging that with this target. 'target_name': 'chromium_builder_tests', 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': [ |