| Index: scripts/slave/recipe_modules/chromium_tests/chromium_fyi.py
|
| diff --git a/scripts/slave/recipe_modules/chromium_tests/chromium_fyi.py b/scripts/slave/recipe_modules/chromium_tests/chromium_fyi.py
|
| index 6e0c29d6e223dcbf9b6817e5eac4efe2b8f3826d..abb3423be0e89bbab6896fc71a28c42b65c6d57d 100644
|
| --- a/scripts/slave/recipe_modules/chromium_tests/chromium_fyi.py
|
| +++ b/scripts/slave/recipe_modules/chromium_tests/chromium_fyi.py
|
| @@ -42,6 +42,7 @@
|
| 'chromium_apply_config': [
|
| 'chromium_mac_mac_views',
|
| 'mb',
|
| + 'force_mac_toolchain'
|
| ],
|
| 'chromium_config_kwargs': {
|
| 'BUILD_CONFIG': 'Release',
|
| @@ -54,7 +55,7 @@
|
| },
|
| 'Chromium Mac 10.11': {
|
| 'chromium_config': 'chromium',
|
| - 'chromium_apply_config': ['mb'],
|
| + 'chromium_apply_config': ['mb', 'force_mac_toolchain'],
|
| 'gclient_config': 'chromium',
|
| 'chromium_config_kwargs': {
|
| 'BUILD_CONFIG': 'Release',
|
| @@ -66,7 +67,7 @@
|
| },
|
| 'Chromium Mac 10.11 Force Mac Toolchain': {
|
| 'chromium_config': 'chromium',
|
| - 'chromium_apply_config': ['mb'],
|
| + 'chromium_apply_config': ['mb', 'force_mac_toolchain'],
|
| 'gclient_config': 'chromium',
|
| 'chromium_config_kwargs': {
|
| 'BUILD_CONFIG': 'Release',
|
| @@ -251,6 +252,7 @@
|
| 'Print Preview Mac': {
|
| 'chromium_config': 'chromium',
|
| 'gclient_config': 'chromium',
|
| + 'chromium_apply_config': ['force_mac_toolchain'],
|
| 'GYP_DEFINES': {
|
| 'component': 'shared_library',
|
| },
|
| @@ -399,6 +401,7 @@
|
| 'Mac OpenSSL': {
|
| 'chromium_config': 'chromium',
|
| 'gclient_config': 'chromium',
|
| + 'chromium_apply_config': ['force_mac_toolchain'],
|
| 'chromium_config_kwargs': {
|
| 'BUILD_CONFIG': 'Release',
|
| 'TARGET_BITS': 32,
|
| @@ -1122,7 +1125,7 @@
|
| },
|
| 'Chromium Mac 10.9 Goma Canary': {
|
| 'chromium_config': 'chromium',
|
| - 'chromium_apply_config': ['goma_canary', 'mb'],
|
| + 'chromium_apply_config': ['goma_canary', 'mb', 'force_mac_toolchain'],
|
| 'gclient_config': 'chromium',
|
| 'chromium_config_kwargs': {
|
| 'BUILD_CONFIG': 'Release',
|
| @@ -1137,7 +1140,7 @@
|
| },
|
| 'Chromium Mac 10.9 Goma Canary (dbg)': {
|
| 'chromium_config': 'chromium',
|
| - 'chromium_apply_config': ['goma_canary', 'mb'],
|
| + 'chromium_apply_config': ['goma_canary', 'mb', 'force_mac_toolchain'],
|
| 'gclient_config': 'chromium',
|
| 'chromium_config_kwargs': {
|
| 'BUILD_CONFIG': 'Debug',
|
| @@ -1156,6 +1159,7 @@
|
| 'clobber',
|
| 'goma_canary',
|
| 'mb',
|
| + 'force_mac_toolchain',
|
| ],
|
| 'gclient_config': 'chromium',
|
| 'chromium_config_kwargs': {
|
| @@ -1175,6 +1179,7 @@
|
| 'clobber',
|
| 'goma_canary',
|
| 'mb',
|
| + 'force_mac_toolchain',
|
| ],
|
| 'gclient_config': 'chromium',
|
| 'chromium_config_kwargs': {
|
|
|