| OLD | NEW | 
|---|
| 1 # Copyright 2015 The Chromium Authors. All rights reserved. | 1 # Copyright 2015 The Chromium Authors. All rights reserved. | 
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be | 
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. | 
| 4 | 4 | 
| 5 { | 5 { | 
| 6   # This is the list of configs that you can pass to mb; each config | 6   # This is the list of configs that you can pass to mb; each config | 
| 7   # represents a particular combination of GYP_DEFINES/gn args that | 7   # represents a particular combination of GYP_DEFINES/gn args that | 
| 8   # we must support. A given config *may* be platform-specific but | 8   # we must support. A given config *may* be platform-specific but | 
| 9   # is not necessarily so (i.e., we might have mac, win, and linux | 9   # is not necessarily so (i.e., we might have mac, win, and linux | 
| 10   # bots all using the 'gn_release_bot' config). | 10   # bots all using the 'gn_release_bot' config). | 
| (...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 82 | 82 | 
| 83     'noswarming_gn_release_bot': ['noswarming', 'gn', 'release_bot'], | 83     'noswarming_gn_release_bot': ['noswarming', 'gn', 'release_bot'], | 
| 84     'noswarming_gyp_release_bot': ['noswarming', 'gyp', 'release_bot'], | 84     'noswarming_gyp_release_bot': ['noswarming', 'gyp', 'release_bot'], | 
| 85     'noswarming_gyp_release_bot_mac_strip': ['noswarming', 'gyp', 'release_bot',
      'mac_strip'], | 85     'noswarming_gyp_release_bot_mac_strip': ['noswarming', 'gyp', 'release_bot',
      'mac_strip'], | 
| 86     'noswarming_gyp_release_bot_x86': ['noswarming', 'gyp', 'release_bot', 'x86'
     ], | 86     'noswarming_gyp_release_bot_x86': ['noswarming', 'gyp', 'release_bot', 'x86'
     ], | 
| 87 | 87 | 
| 88     'swarming_android_gn_release_bot_minimal_symbols': ['swarming', 'android', '
     gn', 'release_bot', 'minimal_symbols'], | 88     'swarming_android_gn_release_bot_minimal_symbols': ['swarming', 'android', '
     gn', 'release_bot', 'minimal_symbols'], | 
| 89     'swarming_asan_lsan_gyp_release_trybot': ['swarming', 'asan', 'lsan', 'relea
     se_trybot'], | 89     'swarming_asan_lsan_gyp_release_trybot': ['swarming', 'asan', 'lsan', 'relea
     se_trybot'], | 
| 90     'swarming_msan_gyp_release_trybot': ['swarming', 'chromeos', 'msan', 'gyp', 
     'release_trybot'], | 90     'swarming_msan_gyp_release_trybot': ['swarming', 'chromeos', 'msan', 'gyp', 
     'release_trybot'], | 
| 91     'swarming_deterministic_gyp_release_bot': ['swarming', 'deterministic', 'gyp
     ', 'release_bot'], | 91     'swarming_deterministic_gyp_release_bot': ['swarming', 'deterministic', 'gyp
     ', 'release_bot'], | 
| 92     'swarming_gpu_fyi_tests_gn_debug_bot': ['swarming', 'gpu_tests', 'internal_g
     les2_conform_tests', 'gn', 'debug_bot', 'angle_deqp_tests'], | 92     'swarming_gpu_fyi_tests_gn_debug_bot': ['swarming', 'gpu_tests', 'internal_g
     les2_conform_tests', 'gn', 'debug_bot'], | 
| 93     'swarming_gpu_fyi_tests_gn_debug_trybot': ['swarming', 'gpu_tests', 'interna
     l_gles2_conform_tests', 'gn', 'debug_trybot', 'angle_deqp_tests'], | 93     'swarming_gpu_fyi_tests_gn_debug_trybot': ['swarming', 'gpu_tests', 'interna
     l_gles2_conform_tests', 'gn', 'debug_trybot'], | 
| 94     'swarming_gpu_fyi_tests_gn_release_bot': ['swarming', 'gpu_tests', 'internal
     _gles2_conform_tests', 'gn', 'release_bot', 'angle_deqp_tests'], | 94     'swarming_gpu_fyi_tests_gn_release_bot': ['swarming', 'gpu_tests', 'internal
     _gles2_conform_tests', 'gn', 'release_bot'], | 
| 95     'swarming_gpu_fyi_tests_gn_release_trybot': ['swarming', 'gpu_tests', 'inter
     nal_gles2_conform_tests', 'gn', 'release_trybot', 'angle_deqp_tests'], | 95     'swarming_gpu_fyi_tests_gn_release_trybot': ['swarming', 'gpu_tests', 'inter
     nal_gles2_conform_tests', 'gn', 'release_trybot'], | 
| 96     'swarming_gpu_tests_gn_debug_bot': ['swarming', 'gpu_tests', 'gn', 'debug_bo
     t'], | 96     'swarming_gpu_tests_gn_debug_bot': ['swarming', 'gpu_tests', 'gn', 'debug_bo
     t'], | 
| 97     'swarming_gpu_tests_gn_release_bot': ['swarming', 'gpu_tests', 'gn', 'releas
     e_bot'], | 97     'swarming_gpu_tests_gn_release_bot': ['swarming', 'gpu_tests', 'gn', 'releas
     e_bot'], | 
| 98     'swarming_gpu_tests_gn_release_trybot': ['swarming', 'gpu_tests', 'gn', 'rel
     ease_trybot'], | 98     'swarming_gpu_tests_gn_release_trybot': ['swarming', 'gpu_tests', 'gn', 'rel
     ease_trybot'], | 
| 99     'swarming_gn_debug_bot': ['swarming', 'gn', 'debug_bot'], | 99     'swarming_gn_debug_bot': ['swarming', 'gn', 'debug_bot'], | 
| 100     'swarming_gn_debug_bot_minimal_symbols_x64': ['swarming', 'gn', 'debug_bot_m
     inimal_symbols', 'x64'], | 100     'swarming_gn_debug_bot_minimal_symbols_x64': ['swarming', 'gn', 'debug_bot_m
     inimal_symbols', 'x64'], | 
| 101     'swarming_gn_debug_bot_x64': ['swarming', 'gn', 'debug_bot', 'x64'], | 101     'swarming_gn_debug_bot_x64': ['swarming', 'gn', 'debug_bot', 'x64'], | 
| 102     'swarming_gn_debug_trybot': ['swarming', 'gn', 'debug_trybot'], | 102     'swarming_gn_debug_trybot': ['swarming', 'gn', 'debug_trybot'], | 
| 103     'swarming_gn_oilpan_debug_bot_minimal_symbols_x64': ['swarming', 'gn', 'oilp
     an', 'debug_bot', 'minimal_symbols', 'x64'], | 103     'swarming_gn_oilpan_debug_bot_minimal_symbols_x64': ['swarming', 'gn', 'oilp
     an', 'debug_bot', 'minimal_symbols', 'x64'], | 
| 104     'swarming_gn_oilpan_debug_bot_x64': ['swarming', 'gn', 'oilpan', 'debug_bot'
     , 'minimal_symbols', 'x64'], | 104     'swarming_gn_oilpan_debug_bot_x64': ['swarming', 'gn', 'oilpan', 'debug_bot'
     , 'minimal_symbols', 'x64'], | 
| 105     'swarming_gn_oilpan_release_bot_x64': ['swarming', 'gn', 'oilpan', 'release_
     bot', 'x64'], | 105     'swarming_gn_oilpan_release_bot_x64': ['swarming', 'gn', 'oilpan', 'release_
     bot', 'x64'], | 
| (...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 168   ], | 168   ], | 
| 169 | 169 | 
| 170   # This is a dict mapping a given 'mixin' name to a dict of settings that | 170   # This is a dict mapping a given 'mixin' name to a dict of settings that | 
| 171   # mb should use. See //tools/mb/docs/user_guide.md for more information. | 171   # mb should use. See //tools/mb/docs/user_guide.md for more information. | 
| 172   'mixins': { | 172   'mixins': { | 
| 173     'android': { | 173     'android': { | 
| 174       'gn_args': 'target_os="android"', | 174       'gn_args': 'target_os="android"', | 
| 175       'gyp_defines': 'OS=android', | 175       'gyp_defines': 'OS=android', | 
| 176     }, | 176     }, | 
| 177 | 177 | 
| 178     'angle_deqp_tests': { |  | 
| 179       'gn_args': 'build_angle_deqp_tests=true', |  | 
| 180     }, |  | 
| 181 |  | 
| 182     'arm': { | 178     'arm': { | 
| 183       'gn_args': 'target_cpu="arm"', | 179       'gn_args': 'target_cpu="arm"', | 
| 184       'gyp_defines': 'target_arch=arm', | 180       'gyp_defines': 'target_arch=arm', | 
| 185     }, | 181     }, | 
| 186 | 182 | 
| 187     'arm64': { | 183     'arm64': { | 
| 188       'gn_args': 'target_cpu="arm64"', | 184       'gn_args': 'target_cpu="arm64"', | 
| 189       'gyp_defines': 'target_arch=arm64', | 185       'gyp_defines': 'target_arch=arm64', | 
| 190     }, | 186     }, | 
| 191 | 187 | 
| (...skipping 541 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 733       'win8_chromium_gn_upload': 'gn_release_bot_minimal_symbols_x86', | 729       'win8_chromium_gn_upload': 'gn_release_bot_minimal_symbols_x86', | 
| 734       'win_clang_x64_dbg': 'win_clang_debug_bot', | 730       'win_clang_x64_dbg': 'win_clang_debug_bot', | 
| 735     }, | 731     }, | 
| 736     'tryserver.v8': { | 732     'tryserver.v8': { | 
| 737       'v8_linux_chromium_gn_rel': 'gn_release_trybot', | 733       'v8_linux_chromium_gn_rel': 'gn_release_trybot', | 
| 738       'v8_android_chromium_gn_dbg': 'android_gn_debug_bot', | 734       'v8_android_chromium_gn_dbg': 'android_gn_debug_bot', | 
| 739       'v8_linux_blink_rel': 'swarming_gn_release_trybot_minimal_symbols_x64', | 735       'v8_linux_blink_rel': 'swarming_gn_release_trybot_minimal_symbols_x64', | 
| 740     }, | 736     }, | 
| 741   }, | 737   }, | 
| 742 } | 738 } | 
| OLD | NEW | 
|---|