merged 1908
git-svn-id: http://src.chromium.org/svn/trunk/src/build@264526 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
This commit is contained in:
Родитель
d7e3439c60
Коммит
41b7686ab0
11
all.gyp
11
all.gyp
|
@ -242,6 +242,17 @@
|
|||
}],
|
||||
],
|
||||
}, # 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.gyp:content_shell',
|
||||
],
|
||||
},
|
||||
{
|
||||
# Note: Android uses android_builder_tests below.
|
||||
# TODO: Consider merging that with this target.
|
||||
|
|
|
@ -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%': 'true',
|
||||
'win_third_party_warn_as_error%': 'false',
|
||||
|
||||
# Clang stuff.
|
||||
'clang%': '<(clang)',
|
||||
|
@ -2727,6 +2727,7 @@
|
|||
}],
|
||||
[ 'OS=="mac" or OS=="ios"', {
|
||||
'xcode_settings': {
|
||||
'GCC_TREAT_WARNINGS_AS_ERRORS': 'NO',
|
||||
'WARNING_CFLAGS!': ['-Wall', '-Wextra'],
|
||||
},
|
||||
'conditions': [
|
||||
|
|
Загрузка…
Ссылка в новой задаче