Index: webrtc/build/mb_config.pyl |
diff --git a/webrtc/build/mb_config.pyl b/webrtc/build/mb_config.pyl |
index 0d0215e32abe07d363dbf9108bad2b318ead0a72..3c49ee33163e33d7b6e57cd23d83ff93d09fbaab 100644 |
--- a/webrtc/build/mb_config.pyl |
+++ b/webrtc/build/mb_config.pyl |
@@ -26,32 +26,26 @@ |
'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 (GYP)': 'ios_gyp_debug_static_bot_arm64_device', |
- 'iOS64 Release (GYP)': 'ios_gyp_release_bot_arm64_device', |
# Mac |
'Mac64 Debug': 'gn_debug_bot_x64', |
'Mac64 Release': 'gn_release_bot_x64', |
'Mac Asan': 'mac_gn_asan_clang_release_bot_x64', |
'Mac64 Release [large tests]': 'gn_release_bot_x64', |
- 'Mac64 Debug (GYP)': 'gyp_debug_bot_x64_exclude_tests', |
- 'Mac64 Release (GYP)': 'gyp_release_bot_x64_exclude_tests', |
# Linux |
'Linux32 Debug': 'gn_debug_bot_x86', |
'Linux32 Release': 'gn_release_bot_x86', |
- 'Linux32 ARM': 'gn_crosscompile_release_bot_arm', |
+ 'Linux32 ARM': 'gn_release_bot_arm', |
'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 Memcheck': 'gn_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 (GYP)': 'gyp_debug_bot_x64_exclude_tests', |
- 'Linux64 Release (GYP)': 'gyp_release_bot_x64_exclude_tests', |
# Android |
'Android32 (M Nexus5X)': 'android_gn_release_bot_arm', |
@@ -63,8 +57,6 @@ |
'Android64 Builder x64 (dbg)': 'android_gn_debug_static_bot_x64', |
'Android32 Builder MIPS (dbg)': 'android_gn_clang_debug_static_bot_mipsel', |
'Android32 Clang (dbg)': 'android_gn_clang_debug_bot_arm', |
- 'Android32 GYP': 'android_gyp_release_bot_arm', |
- 'Android32 GYP (dbg)': 'android_gyp_debug_static_bot_arm', |
# Windows |
'Win32 Debug': 'gn_debug_bot_x86', |
@@ -77,8 +69,6 @@ |
'Win64 Release (Clang)': 'win_gn_clang_release_bot_x64', |
'Win SyzyASan': 'win_gn_syzyasan_release_bot_x86', |
'Win32 Release [large tests]': 'gn_release_bot_x86', |
- 'Win64 Debug (GYP)': 'gyp_debug_bot_x64_exclude_tests', |
- 'Win64 Release (GYP)': 'gyp_release_bot_x64_exclude_tests', |
}, |
'client.webrtc.perf': { |
# Android |
@@ -95,7 +85,7 @@ |
# Linux |
'Linux64 GCC': 'gn_gcc_release_bot_x64', |
'Linux Asan (swarming)': 'gn_asan_lsan_clang_release_bot_x64', |
- 'Linux Memcheck (swarming)': 'gn_memcheck_release_bot_x64', |
+ 'Linux Memcheck (swarming)': 'gn_release_bot_x64', |
'Linux MSan (swarming)': 'gn_msan_clang_release_bot_x64', |
'Linux Tsan v2 (swarming)': 'gn_tsan_clang_release_bot_x64', |
'Linux UBSan (swarming)': 'gn_ubsan_clang_release_bot_x64', |
@@ -122,8 +112,6 @@ |
'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_gyp_dbg': 'ios_gyp_debug_static_bot_arm64_device', |
- 'ios64_gyp_rel': 'ios_gyp_release_bot_arm64_device', |
# Mac |
'mac_compile_dbg': 'gn_debug_bot_x64', |
@@ -133,8 +121,6 @@ |
'mac_asan': 'mac_gn_asan_clang_release_bot_x64', |
'mac_baremetal': 'gn_release_bot_x64', |
'mac_swarming': 'swarming_gn_debug_bot_x64', |
- 'mac_gyp_dbg': 'gyp_debug_bot_x64_exclude_tests', |
- 'mac_gyp_rel': 'gyp_release_bot_x64_exclude_tests', |
# Linux |
'linux_compile_dbg': 'gn_debug_bot_x64', |
@@ -143,17 +129,15 @@ |
'linux_rel': 'gn_release_bot_x64', |
'linux32_dbg': 'gn_debug_bot_x86', |
'linux32_rel': 'gn_release_bot_x86', |
- 'linux_arm': 'gn_crosscompile_release_bot_arm', |
+ 'linux_arm': 'gn_release_bot_arm', |
'linux_asan': 'gn_asan_lsan_clang_release_bot_x64', |
- 'linux_memcheck': 'gn_memcheck_release_bot_x64', |
+ 'linux_memcheck': 'gn_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', |
- 'linux_gyp_dbg': 'gyp_debug_bot_x64_exclude_tests', |
- 'linux_gyp_rel': 'gyp_release_bot_x64_exclude_tests', |
# Android |
'android_compile_dbg': 'android_gn_debug_static_bot_arm', |
@@ -169,8 +153,6 @@ |
'android_clang_dbg': 'android_gn_clang_debug_bot_arm', |
'android_arm64_rel': 'android_gn_release_bot_arm64', |
'android_n6': 'android_gn_debug_static_bot_arm', |
- 'android_gyp_dbg': 'android_gyp_debug_static_bot_arm', |
- 'android_gyp_rel': 'android_gyp_release_bot_arm', |
'android_swarming': 'swarming_android_gn_release_bot_arm', |
# Windows |
@@ -191,8 +173,6 @@ |
'win_swarming': 'swarming_gn_debug_bot_x64', |
'win_x64_win8': 'gn_debug_bot_x64', |
'win_x64_win10': 'gn_debug_bot_x64', |
- 'win_x64_gyp_dbg': 'gyp_debug_bot_x64_exclude_tests', |
- 'win_x64_gyp_rel': 'gyp_release_bot_x64_exclude_tests', |
} |
}, |
@@ -221,34 +201,17 @@ |
'ios_gn_debug_static_bot_x64': [ |
'ios', 'gn', 'debug_static_bot', 'x64' |
], |
- 'ios_gyp_debug_static_bot_arm64_device': [ |
- 'ios', 'gyp', 'gyp_limited_support_build', 'debug_static_bot', 'arm64', |
- 'device' |
- ], |
- 'ios_gyp_release_bot_arm64_device': [ |
- 'ios', 'gyp', 'gyp_limited_support_build', 'release_bot', 'arm64', |
- 'device' |
- ], |
# Linux, Mac and Windows |
'gn_gcc_release_bot_x64': [ |
'gn', 'gcc', 'release_bot', 'x64' |
], |
- 'gn_crosscompile_release_bot_arm': [ |
- 'gn', 'crosscompile', 'openh264_release_bot', 'arm' |
- ], |
- 'gyp_debug_bot_x64_exclude_tests': [ |
- 'gyp', 'gyp_limited_support_build', 'debug_bot', 'x64' |
- ], |
- 'gyp_release_bot_x64_exclude_tests': [ |
- 'gyp', 'gyp_limited_support_build', 'release_bot', 'x64' |
+ 'gn_release_bot_arm': [ |
+ 'gn', 'openh264_release_bot', 'arm' |
], |
'gn_asan_lsan_clang_release_bot_x64': [ |
'gn', 'asan', 'lsan', 'clang', 'openh264_release_bot', 'x64' |
], |
- 'gn_memcheck_release_bot_x64': [ |
- 'gn', 'memcheck', 'openh264_release_bot', 'x64' |
- ], |
'gn_msan_clang_release_bot_x64': [ |
'gn', 'msan', 'clang', 'openh264_release_bot', 'x64' |
], |
@@ -300,12 +263,6 @@ |
], |
# Android |
- 'android_gyp_debug_static_bot_arm': [ |
- 'android', 'gyp', 'gyp_limited_support_build', 'debug_static_bot', 'arm' |
- ], |
- 'android_gyp_release_bot_arm': [ |
- 'android', 'gyp', 'gyp_limited_support_build', 'release_bot', 'arm' |
- ], |
'android_gn_debug_static_bot_arm': [ |
'android', 'gn', 'debug_static_bot', 'arm' |
], |
@@ -352,40 +309,26 @@ |
'mixins': { |
'android': { |
'gn_args': 'target_os="android"', |
- 'gyp_defines': 'OS=android', |
}, |
'arm': { |
'gn_args': 'target_cpu="arm"', |
- 'gyp_defines': 'target_arch=arm', |
}, |
'arm64': { |
'gn_args': 'target_cpu="arm64"', |
- 'gyp_defines': 'target_arch=arm64', |
}, |
'asan': { |
'gn_args': 'is_asan=true', |
- 'gyp_defines': 'asan=1', |
}, |
'clang': { |
'gn_args': 'is_clang=true', |
- 'gyp_defines': 'clang=1', |
- }, |
- |
- 'crosscompile': { |
- # This mixin is only needed on GYP bots that are doing cross-compiles |
- # but are *not* targetting Android or iOS (where |
- # webrtc/build/gyp_webrtc.py will set the crosscompile variable |
- # automatically). It is not need in GN at all. |
- 'gyp_crosscompile': True, |
}, |
'dcheck_always_on': { |
'gn_args': 'dcheck_always_on=true', |
- 'gyp_defines': 'dcheck_always_on=1', |
}, |
'debug': { |
@@ -402,7 +345,6 @@ |
'device': { |
'gn_args': 'ios_enable_code_signing=false', |
- 'gyp_defines': 'chromium_ios_signing=0', |
}, |
# This mixin is used to force configs that use it to fail. It |
@@ -411,7 +353,6 @@ |
# that are test-only and should never run MB. |
'error': { |
'gn_args': 'error', |
- 'gyp_defines': 'target_arch=unknown', |
}, |
'gcc': { |
@@ -422,22 +363,7 @@ |
'gn': {'type': 'gn'}, |
'goma': { |
- # The MB code will properly escape goma_dir if necessary in the GYP |
- # code path; the GN code path needs no escaping. |
'gn_args': 'use_goma=true', |
- 'gyp_defines': 'use_goma=1', |
- }, |
- |
- 'gyp': {'type': 'gyp'}, |
- |
- 'gyp_limited_support_build': { |
- 'gyp_defines': ( |
- 'include_examples=0 include_tests=0 include_ilbc=0 ' |
- 'build_expat=0 build_json=0 build_libevent=0 build_libjpeg=0 ' |
- 'build_libsrtp=0 build_libvpx=0 build_libyuv=0 build_openmax_dl=0 ' |
- 'build_opus=0 build_protobuf=0 build_ssl=0 build_usrsctp=0 ' |
- 'enable_video=0 linux_use_bundled_binutils=0 rtc_use_openmax_dl=1 ' |
- 'use_openssl=1 use_x11=0 use_gtk=0'), |
}, |
'ios': { |
@@ -447,38 +373,27 @@ |
'lsan': { |
'gn_args': 'is_lsan=true', |
- 'gyp_defines': 'lsan=1', |
- }, |
- |
- 'memcheck': { |
- 'gyp_defines': 'build_for_tool=memcheck', |
}, |
'minimal_symbols': { |
'gn_args': 'symbol_level=1', |
- 'gyp_defines': 'fastbuild=1', |
}, |
'mipsel': { |
'gn_args': 'target_cpu="mipsel"', |
- 'gyp_defines': 'target_arch=mipsel', |
}, |
'minimal_symbols': { |
'gn_args': 'symbol_level=1', |
- 'gyp_defines': 'fastbuild=1', |
}, |
'msan': { |
'gn_args': ('is_msan=true msan_track_origins=2 ' |
'use_prebuilt_instrumented_libraries=true'), |
- 'gyp_defines': ('msan=1 msan_track_origins=2 ' |
- 'use_prebuilt_instrumented_libraries=1'), |
}, |
'openh264': { |
'gn_args': 'ffmpeg_branding="Chrome" rtc_use_h264=true', |
- 'gyp_defines': 'ffmpeg_branding=Chrome rtc_use_h264=1', |
}, |
'openh264_debug_bot': { |
@@ -499,47 +414,38 @@ |
'shared': { |
'gn_args': 'is_component_build=true', |
- 'gyp_defines': 'component=shared_library', |
}, |
'static': { |
'gn_args': 'is_component_build=false', |
- 'gyp_defines': 'component=static_library', |
}, |
'swarming': { |
'gn_args': '', |
- 'gyp_defines': 'test_isolation_mode=prepare', |
}, |
'syzyasan': { |
'gn_args': 'is_syzyasan=true', |
- 'gyp_defines': 'syzyasan=1' |
}, |
'tsan': { |
'gn_args': 'is_tsan=true', |
- 'gyp_defines': 'tsan=1', |
}, |
'ubsan': { |
'gn_args': 'is_ubsan=true', |
- 'gyp_defines': 'ubsan=1', |
}, |
'ubsan_vptr': { |
'gn_args': 'is_ubsan_vptr=true', |
- 'gyp_defines': 'ubsan_vptr=1', |
}, |
'x64': { |
'gn_args': 'target_cpu="x64"', |
- 'gyp_defines': 'target_arch=x64', |
}, |
'x86': { |
'gn_args': 'target_cpu="x86"', |
- 'gyp_defines': 'target_arch=ia32', |
}, |
}, |
} |