[mb] Set correct default values for sysroot and icu
Port https://codereview.chromium.org/2057053002/ for the v8-side configurations. BUG=chromium:616035 NOTRY=true TBR=vogelheim@chromium.org, jochen@chromium.org Review-Url: https://codereview.chromium.org/2066823002 Cr-Commit-Position: refs/heads/master@{#36967}
This commit is contained in:
parent
2fdf33bb2a
commit
f1ac74b253
@ -14,9 +14,9 @@
|
|||||||
|
|
||||||
'configs': {
|
'configs': {
|
||||||
'gyp_swarming_release': [
|
'gyp_swarming_release': [
|
||||||
'release_bot', 'swarming_bot', 'gyp'],
|
'release_bot', 'swarming', 'gyp'],
|
||||||
'gn_swarming_release': [
|
'gn_swarming_release': [
|
||||||
'release_bot', 'swarming_bot', 'gn'],
|
'release_bot', 'swarming', 'gn'],
|
||||||
},
|
},
|
||||||
|
|
||||||
'mixins': {
|
'mixins': {
|
||||||
@ -39,16 +39,6 @@
|
|||||||
|
|
||||||
'gyp': {'type': 'gyp'},
|
'gyp': {'type': 'gyp'},
|
||||||
|
|
||||||
# TODO(machenbach): Remove the following two configs, once the v8 default
|
|
||||||
# has changed.
|
|
||||||
'no_sysroot': {
|
|
||||||
'gn_args': 'use_sysroot=false',
|
|
||||||
},
|
|
||||||
|
|
||||||
'no_icu_data_file': {
|
|
||||||
'gn_args': 'icu_use_data_file=false',
|
|
||||||
},
|
|
||||||
|
|
||||||
'release': {
|
'release': {
|
||||||
'gn_args': 'is_debug=false',
|
'gn_args': 'is_debug=false',
|
||||||
},
|
},
|
||||||
@ -71,9 +61,5 @@
|
|||||||
'gn_args': 'v8_test_isolation_mode="prepare"',
|
'gn_args': 'v8_test_isolation_mode="prepare"',
|
||||||
'gyp_defines': 'test_isolation_mode=prepare',
|
'gyp_defines': 'test_isolation_mode=prepare',
|
||||||
},
|
},
|
||||||
|
|
||||||
'swarming_bot': {
|
|
||||||
'mixins': ['swarming', 'no_sysroot', 'no_icu_data_file'],
|
|
||||||
},
|
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user