| Index: webrtc/build/mb_config.pyl
|
| diff --git a/webrtc/build/mb_config.pyl b/webrtc/build/mb_config.pyl
|
| index d09d5d2c4b780dcd7439c232ee5d48618c5d6759..06253eba3672f0868396c51614c192ab4501de9a 100644
|
| --- a/webrtc/build/mb_config.pyl
|
| +++ b/webrtc/build/mb_config.pyl
|
| @@ -20,36 +20,36 @@
|
| 'masters': {
|
| 'client.webrtc': {
|
| # iOS
|
| - 'iOS32 Debug': 'ios_gyp_debug_static_bot_arm_device',
|
| - 'iOS32 Release': 'ios_gyp_release_bot_arm_device',
|
| - 'iOS64 Debug': 'ios_gyp_debug_static_bot_arm64_device',
|
| - 'iOS64 Release': 'ios_gyp_release_bot_arm64_device',
|
| - 'iOS32 Simulator Debug': 'ios_gyp_debug_static_bot_x86',
|
| - 'iOS64 Simulator Debug': 'ios_gyp_debug_static_bot_x64',
|
| + 'iOS32 Debug': 'ios_gn_debug_static_bot_arm_device',
|
| + 'iOS32 Release': 'ios_gn_release_bot_arm_device',
|
| + 'iOS64 Debug': 'ios_gn_debug_static_bot_arm64_device',
|
| + 'iOS64 Release': 'ios_gn_release_bot_arm64_device',
|
| + 'iOS32 Simulator Debug': 'ios_gn_debug_static_bot_x86',
|
| + 'iOS64 Simulator Debug': 'ios_gn_debug_static_bot_x64',
|
| 'iOS64 Debug (GN)': 'ios_gn_debug_static_bot_arm64_device',
|
| 'iOS64 Release (GN)': 'ios_gn_release_bot_arm64_device',
|
|
|
| # Mac
|
| - 'Mac64 Debug': 'gyp_debug_bot_x64',
|
| - 'Mac64 Release': 'gyp_release_bot_x64',
|
| + 'Mac64 Debug': 'gn_debug_bot_x64',
|
| + 'Mac64 Release': 'gn_release_bot_x64',
|
| 'Mac64 Debug (GN)': 'gn_debug_bot_x64',
|
| 'Mac64 Release (GN)': 'gn_release_bot_x64',
|
| - 'Mac Asan': 'mac_gyp_asan_clang_release_bot_x64',
|
| - 'Mac64 Release [large tests]': 'gyp_release_bot_x64',
|
| + 'Mac Asan': 'mac_gn_asan_clang_release_bot_x64',
|
| + 'Mac64 Release [large tests]': 'gn_release_bot_x64',
|
|
|
| # Linux
|
| - 'Linux32 ARM': 'gyp_crosscompile_release_bot_arm',
|
| - 'Linux32 Debug': 'gyp_debug_bot_x86',
|
| - 'Linux32 Release': 'gyp_release_bot_x86',
|
| - 'Linux64 Debug': 'gyp_debug_bot_x64',
|
| - 'Linux64 Release': 'gyp_release_bot_x64',
|
| - 'Linux Asan': 'gyp_asan_lsan_clang_release_bot_x64',
|
| - 'Linux Memcheck': 'gyp_memcheck_release_bot_x64',
|
| - 'Linux MSan': 'gyp_msan_clang_release_bot_x64',
|
| - 'Linux Tsan v2': 'gyp_tsan_clang_release_bot_x64',
|
| - 'Linux UBSan': 'gyp_ubsan_clang_release_bot_x64',
|
| - 'Linux UBSan vptr': 'gyp_ubsan_vptr_clang_release_bot_x64',
|
| - 'Linux64 Release [large tests]': 'gyp_release_bot_x64',
|
| + 'Linux32 ARM': 'gn_crosscompile_release_bot_arm',
|
| + 'Linux32 Debug': 'gn_debug_bot_x86',
|
| + 'Linux32 Release': 'gn_release_bot_x86',
|
| + 'Linux64 Debug': 'gn_debug_bot_x64',
|
| + 'Linux64 Release': 'gn_release_bot_x64',
|
| + 'Linux Asan': 'gn_asan_lsan_clang_release_bot_x64',
|
| + 'Linux Memcheck': 'gn_memcheck_release_bot_x64',
|
| + 'Linux MSan': 'gn_msan_clang_release_bot_x64',
|
| + 'Linux Tsan v2': 'gn_tsan_clang_release_bot_x64',
|
| + 'Linux UBSan': 'gn_ubsan_clang_release_bot_x64',
|
| + 'Linux UBSan vptr': 'gn_ubsan_vptr_clang_release_bot_x64',
|
| + 'Linux64 Release [large tests]': 'gn_release_bot_x64',
|
| 'Linux64 Debug (GN)': 'gn_debug_bot_x64',
|
| 'Linux64 Release (GN)': 'gn_release_bot_x64',
|
|
|
| @@ -76,59 +76,59 @@
|
| 'Android64 Tests (L Nexus9)': 'none',
|
|
|
| # Windows
|
| - 'Win32 Debug': 'gyp_debug_bot_x86',
|
| - 'Win32 Release': 'gyp_release_bot_x86',
|
| - 'Win64 Debug': 'gyp_debug_bot_x64',
|
| - 'Win64 Release': 'gyp_release_bot_x64',
|
| + 'Win32 Debug': 'gn_debug_bot_x86',
|
| + 'Win32 Release': 'gn_release_bot_x86',
|
| + 'Win64 Debug': 'gn_debug_bot_x64',
|
| + 'Win64 Release': 'gn_release_bot_x64',
|
| 'Win64 Debug (GN)': 'gn_debug_bot_x64',
|
| 'Win64 Release (GN)': 'gn_release_bot_x64',
|
| - 'Win32 Debug (Clang)': 'win_gyp_clang_debug_bot_x86',
|
| - 'Win32 Release (Clang)': 'win_gyp_clang_release_bot_x86',
|
| - 'Win64 Debug (Clang)': 'win_gyp_clang_debug_bot_x64',
|
| - 'Win64 Release (Clang)': 'win_gyp_clang_release_bot_x64',
|
| - 'Win SyzyASan': 'win_gyp_syzyasan_release_bot_x86',
|
| - 'Win DrMemory Full': 'win_gyp_drmemory_debug_bot_x86',
|
| - 'Win DrMemory Light': 'win_gyp_drmemory_debug_bot_x86',
|
| - 'Win32 Release [large tests]': 'gyp_release_bot_x86',
|
| + 'Win32 Debug (Clang)': 'win_gn_clang_debug_bot_x86',
|
| + 'Win32 Release (Clang)': 'win_gn_clang_release_bot_x86',
|
| + 'Win64 Debug (Clang)': 'win_gn_clang_debug_bot_x64',
|
| + 'Win64 Release (Clang)': 'win_gn_clang_release_bot_x64',
|
| + 'Win SyzyASan': 'win_gn_syzyasan_release_bot_x86',
|
| + 'Win DrMemory Full': 'win_gn_drmemory_debug_bot_x86',
|
| + 'Win DrMemory Light': 'win_gn_drmemory_debug_bot_x86',
|
| + 'Win32 Release [large tests]': 'gn_release_bot_x86',
|
| },
|
| 'tryserver.webrtc': {
|
| # iOS
|
| - 'ios_dbg': 'ios_gyp_debug_static_bot_arm_device',
|
| - 'ios_rel': 'ios_gyp_release_bot_arm_device',
|
| - 'ios_arm64_dbg': 'ios_gyp_debug_static_bot_arm64_device',
|
| - 'ios_arm64_rel': 'ios_gyp_release_bot_arm64_device',
|
| - 'ios32_sim_dbg': 'ios_gyp_debug_static_bot_x86',
|
| - 'ios64_sim_dbg': 'ios_gyp_debug_static_bot_x64',
|
| + 'ios_dbg': 'ios_gn_debug_static_bot_arm_device',
|
| + 'ios_rel': 'ios_gn_release_bot_arm_device',
|
| + 'ios_arm64_dbg': 'ios_gn_debug_static_bot_arm64_device',
|
| + 'ios_arm64_rel': 'ios_gn_release_bot_arm64_device',
|
| + 'ios32_sim_dbg': 'ios_gn_debug_static_bot_x86',
|
| + 'ios64_sim_dbg': 'ios_gn_debug_static_bot_x64',
|
| 'ios64_gn_dbg': 'ios_gn_debug_static_bot_arm64_device',
|
| 'ios64_gn_rel': 'ios_gn_release_bot_arm64_device',
|
|
|
| # Mac
|
| - 'mac_compile_dbg': 'gyp_debug_bot_x64',
|
| - 'mac_compile_rel': 'gyp_release_bot_x64',
|
| - 'mac_dbg': 'gyp_debug_bot_x64',
|
| - 'mac_rel': 'gyp_release_bot_x64',
|
| + 'mac_compile_dbg': 'gn_debug_bot_x64',
|
| + 'mac_compile_rel': 'gn_release_bot_x64',
|
| + 'mac_dbg': 'gn_debug_bot_x64',
|
| + 'mac_rel': 'gn_release_bot_x64',
|
| 'mac_gn_dbg': 'gn_debug_bot_x64',
|
| 'mac_gn_rel': 'gn_release_bot_x64',
|
| - 'mac_asan': 'mac_gyp_asan_clang_release_bot_x64',
|
| - 'mac_baremetal': 'gyp_release_bot_x64',
|
| - 'mac_swarming': 'swarming_gyp_debug_bot_x64',
|
| + 'mac_asan': 'mac_gn_asan_clang_release_bot_x64',
|
| + 'mac_baremetal': 'gn_release_bot_x64',
|
| + 'mac_swarming': 'swarming_gn_debug_bot_x64',
|
|
|
| # Linux
|
| - 'linux_compile_dbg': 'gyp_debug_bot_x64',
|
| - 'linux_compile_rel': 'gyp_release_bot_x64',
|
| - 'linux_dbg': 'gyp_debug_bot_x64',
|
| - 'linux_rel': 'gyp_release_bot_x64',
|
| + 'linux_compile_dbg': 'gn_debug_bot_x64',
|
| + 'linux_compile_rel': 'gn_release_bot_x64',
|
| + 'linux_dbg': 'gn_debug_bot_x64',
|
| + 'linux_rel': 'gn_release_bot_x64',
|
| 'linux_gn_dbg': 'gn_debug_bot_x64',
|
| 'linux_gn_rel': 'gn_release_bot_x64',
|
| - 'linux_arm': 'gyp_crosscompile_release_bot_arm',
|
| - 'linux_asan': 'gyp_asan_lsan_clang_release_bot_x64',
|
| - 'linux_memcheck': 'gyp_memcheck_release_bot_x64',
|
| - 'linux_msan': 'gyp_msan_clang_release_bot_x64',
|
| - 'linux_tsan2': 'gyp_tsan_clang_release_bot_x64',
|
| - 'linux_ubsan': 'gyp_ubsan_clang_release_bot_x64',
|
| - 'linux_ubsan_vptr': 'gyp_ubsan_vptr_clang_release_bot_x64',
|
| - 'linux_baremetal': 'gyp_release_bot_x64',
|
| - 'linux_swarming': 'swarming_gyp_debug_bot_x64',
|
| + 'linux_arm': 'gn_crosscompile_release_bot_arm',
|
| + 'linux_asan': 'gn_asan_lsan_clang_release_bot_x64',
|
| + 'linux_memcheck': 'gn_memcheck_release_bot_x64',
|
| + 'linux_msan': 'gn_msan_clang_release_bot_x64',
|
| + 'linux_tsan2': 'gn_tsan_clang_release_bot_x64',
|
| + 'linux_ubsan': 'gn_ubsan_clang_release_bot_x64',
|
| + 'linux_ubsan_vptr': 'gn_ubsan_vptr_clang_release_bot_x64',
|
| + 'linux_baremetal': 'gn_release_bot_x64',
|
| + 'linux_swarming': 'swarming_gn_debug_bot_x64',
|
|
|
| # Android
|
| 'android_compile_dbg': 'android_gn_debug_static_bot_arm',
|
| @@ -152,25 +152,25 @@
|
| 'android_gyp_rel': 'android_gyp_release_bot_arm',
|
|
|
| # Windows
|
| - 'win_compile_dbg': 'gyp_debug_bot_x86',
|
| - 'win_compile_rel': 'gyp_release_bot_x86',
|
| - 'win_compile_x64_dbg': 'gyp_debug_bot_x64',
|
| - 'win_compile_x64_rel': 'gyp_release_bot_x64',
|
| - 'win_dbg': 'gyp_debug_bot_x86',
|
| - 'win_rel': 'gyp_release_bot_x86',
|
| - 'win_x64_dbg': 'gyp_debug_bot_x64',
|
| - 'win_x64_rel': 'gyp_release_bot_x64',
|
| + 'win_compile_dbg': 'gn_debug_bot_x86',
|
| + 'win_compile_rel': 'gn_release_bot_x86',
|
| + 'win_compile_x64_dbg': 'gn_debug_bot_x64',
|
| + 'win_compile_x64_rel': 'gn_release_bot_x64',
|
| + 'win_dbg': 'gn_debug_bot_x86',
|
| + 'win_rel': 'gn_release_bot_x86',
|
| + 'win_x64_dbg': 'gn_debug_bot_x64',
|
| + 'win_x64_rel': 'gn_release_bot_x64',
|
| 'win_x64_gn_dbg': 'gn_debug_bot_x64',
|
| 'win_x64_gn_rel': 'gn_release_bot_x64',
|
| - 'win_clang_dbg': 'win_gyp_clang_debug_bot_x86',
|
| - 'win_clang_rel': 'win_gyp_clang_release_bot_x86',
|
| - 'win_x64_clang_dbg': 'win_gyp_clang_debug_bot_x64',
|
| - 'win_x64_clang_rel': 'win_gyp_clang_release_bot_x64',
|
| - 'win_asan': 'win_gyp_syzyasan_release_bot_x86',
|
| - 'win_drmemory_light': 'win_gyp_drmemory_debug_bot_x86',
|
| - 'win_drmemory_full': 'win_gyp_drmemory_debug_bot_x86',
|
| - 'win_baremetal': 'gyp_release_bot_x86',
|
| - 'win_swarming': 'swarming_gyp_debug_bot_x64',
|
| + 'win_clang_dbg': 'win_gn_clang_debug_bot_x86',
|
| + 'win_clang_rel': 'win_gn_clang_release_bot_x86',
|
| + 'win_x64_clang_dbg': 'win_gn_clang_debug_bot_x64',
|
| + 'win_x64_clang_rel': 'win_gn_clang_release_bot_x64',
|
| + 'win_asan': 'win_gn_syzyasan_release_bot_x86',
|
| + 'win_drmemory_light': 'win_gn_drmemory_debug_bot_x86',
|
| + 'win_drmemory_full': 'win_gn_drmemory_debug_bot_x86',
|
| + 'win_baremetal': 'gn_release_bot_x86',
|
| + 'win_swarming': 'swarming_gn_debug_bot_x64',
|
| },
|
| },
|
|
|
| @@ -187,94 +187,82 @@
|
| 'ios_gn_release_bot_arm64_device': [
|
| 'ios', 'gn', 'release_bot', 'arm64', 'device'
|
| ],
|
| - 'ios_gyp_debug_static_bot_arm_device': [
|
| - 'ios', 'gyp', 'debug_static_bot', 'arm', 'device'
|
| + 'ios_gn_debug_static_bot_arm_device': [
|
| + 'ios', 'gn', 'debug_static_bot', 'arm', 'device'
|
| ],
|
| - 'ios_gyp_release_bot_arm_device': [
|
| - 'ios', 'gyp', 'release_bot', 'arm', 'device'
|
| + 'ios_gn_release_bot_arm_device': [
|
| + 'ios', 'gn', 'release_bot', 'arm', 'device'
|
| ],
|
| - 'ios_gyp_debug_static_bot_arm64_device': [
|
| - 'ios', 'gyp', 'debug_static_bot', 'arm64', 'device'
|
| + 'ios_gn_debug_static_bot_x86': [
|
| + 'ios', 'gn', 'debug_static_bot', 'x86'
|
| ],
|
| - 'ios_gyp_release_bot_arm64_device': [
|
| - 'ios', 'gyp', 'release_bot', 'arm64', 'device'
|
| - ],
|
| - 'ios_gyp_debug_static_bot_x86': [
|
| - 'ios', 'gyp', 'debug_static_bot', 'x86'
|
| - ],
|
| - 'ios_gyp_debug_static_bot_x64': [
|
| - 'ios', 'gyp', 'release_bot', 'x64'
|
| + 'ios_gn_debug_static_bot_x64': [
|
| + 'ios', 'gn', 'release_bot', 'x64'
|
| ],
|
|
|
| # Linux, Mac and Windows
|
| - 'gyp_crosscompile_release_bot_arm': [
|
| - 'gyp', 'crosscompile', 'openh264_release_bot', 'arm'
|
| - ],
|
| - 'gyp_debug_bot_x86': [
|
| - 'gyp', 'openh264_debug_bot', 'x86'
|
| + 'gn_crosscompile_release_bot_arm': [
|
| + 'gn', 'crosscompile', 'openh264_release_bot', 'arm'
|
| ],
|
| - 'gyp_release_bot_x86': [
|
| - 'gyp', 'openh264_release_bot', 'x86'
|
| + 'gn_debug_bot_x86': [
|
| + 'gn', 'openh264_debug_bot', 'x86'
|
| ],
|
| - 'gyp_debug_bot_x64': [
|
| - 'gyp', 'openh264_debug_bot', 'x64'
|
| + 'gn_release_bot_x86': [
|
| + 'gn', 'openh264_release_bot', 'x86'
|
| ],
|
| - 'gyp_release_bot_x64': [
|
| - 'gyp', 'openh264_release_bot', 'x64'
|
| - ],
|
| - 'gyp_asan_lsan_clang_release_bot_x64': [
|
| - 'gyp', 'asan', 'lsan', 'clang', 'openh264_release_bot', 'x64'
|
| + 'gn_debug_bot_x64': [
|
| + 'gn', 'openh264_debug_bot', 'x64'
|
| ],
|
| - 'gyp_memcheck_release_bot_x64': [
|
| - 'gyp', 'memcheck', 'openh264_release_bot', 'x64'
|
| + 'gn_release_bot_x64': [
|
| + 'gn', 'openh264_release_bot', 'x64'
|
| ],
|
| - 'gyp_msan_clang_release_bot_x64': [
|
| - 'gyp', 'msan', 'clang', 'openh264_release_bot', 'x64'
|
| + 'gn_asan_lsan_clang_release_bot_x64': [
|
| + 'gn', 'asan', 'lsan', 'clang', 'openh264_release_bot', 'x64'
|
| ],
|
| - 'gyp_tsan_clang_release_bot_x64': [
|
| - 'gyp', 'tsan', 'clang', 'openh264_release_bot', 'x64'
|
| + 'gn_memcheck_release_bot_x64': [
|
| + 'gn', 'memcheck', 'openh264_release_bot', 'x64'
|
| ],
|
| - 'gyp_ubsan_clang_release_bot_x64': [
|
| - 'gyp', 'ubsan', 'clang', 'openh264_release_bot', 'x64'
|
| + 'gn_msan_clang_release_bot_x64': [
|
| + 'gn', 'msan', 'clang', 'openh264_release_bot', 'x64'
|
| ],
|
| - 'gyp_ubsan_vptr_clang_release_bot_x64': [
|
| - 'gyp', 'ubsan_vptr', 'clang', 'openh264_release_bot', 'x64'
|
| + 'gn_tsan_clang_release_bot_x64': [
|
| + 'gn', 'tsan', 'clang', 'openh264_release_bot', 'x64'
|
| ],
|
| - 'gn_debug_bot_x64': [
|
| - 'gn', 'openh264_debug_bot', 'x64'
|
| + 'gn_ubsan_clang_release_bot_x64': [
|
| + 'gn', 'ubsan', 'clang', 'openh264_release_bot', 'x64'
|
| ],
|
| - 'gn_release_bot_x64': [
|
| - 'gn', 'openh264_release_bot', 'x64'
|
| + 'gn_ubsan_vptr_clang_release_bot_x64': [
|
| + 'gn', 'ubsan_vptr', 'clang', 'openh264_release_bot', 'x64'
|
| ],
|
| - 'swarming_gyp_debug_bot_x64': [
|
| - 'swarming', 'gyp', 'openh264_debug_bot', 'x64'
|
| + 'swarming_gn_debug_bot_x64': [
|
| + 'swarming', 'gn', 'openh264_debug_bot', 'x64'
|
| ],
|
|
|
| # Windows
|
| - 'win_gyp_clang_debug_bot_x86': [
|
| - 'gyp', 'clang', 'openh264_debug_bot', 'x86',
|
| + 'win_gn_clang_debug_bot_x86': [
|
| + 'gn', 'clang', 'openh264_debug_bot', 'x86',
|
| ],
|
| - 'win_gyp_clang_release_bot_x86': [
|
| - 'gyp', 'clang', 'openh264_release_bot', 'x86',
|
| + 'win_gn_clang_release_bot_x86': [
|
| + 'gn', 'clang', 'openh264_release_bot', 'x86',
|
| ],
|
| - 'win_gyp_clang_debug_bot_x64': [
|
| - 'gyp', 'clang', 'openh264_debug_bot', 'x64',
|
| + 'win_gn_clang_debug_bot_x64': [
|
| + 'gn', 'clang', 'openh264_debug_bot', 'x64',
|
| ],
|
| - 'win_gyp_clang_release_bot_x64': [
|
| - 'gyp', 'clang', 'openh264_release_bot', 'x64',
|
| + 'win_gn_clang_release_bot_x64': [
|
| + 'gn', 'clang', 'openh264_release_bot', 'x64',
|
| ],
|
| - 'win_gyp_syzyasan_release_bot_x86': [
|
| - 'gyp', 'syzyasan', 'minimal_symbols', 'openh264_release_bot', 'x86',
|
| + 'win_gn_syzyasan_release_bot_x86': [
|
| + 'gn', 'syzyasan', 'minimal_symbols', 'openh264_release_bot', 'x86',
|
| ],
|
| # TODO(kjellander): Flip DrMemory bots over to Release after GN migration
|
| # (http://crbug.com/636414).
|
| - 'win_gyp_drmemory_debug_bot_x86': [
|
| - 'gyp', 'drmemory', 'minimal_symbols', 'openh264_debug_bot', 'x86',
|
| + 'win_gn_drmemory_debug_bot_x86': [
|
| + 'gn', 'drmemory', 'minimal_symbols', 'openh264_debug_bot', 'x86',
|
| ],
|
|
|
| # Mac
|
| - 'mac_gyp_asan_clang_release_bot_x64': [
|
| - 'gyp', 'asan', 'clang', 'openh264_release_bot', 'x64',
|
| + 'mac_gn_asan_clang_release_bot_x64': [
|
| + 'gn', 'asan', 'clang', 'openh264_release_bot', 'x64',
|
| ],
|
|
|
| # Android
|
|
|