| Index: scripts/slave/recipe_modules/webrtc/builders.py
|
| diff --git a/scripts/slave/recipe_modules/webrtc/builders.py b/scripts/slave/recipe_modules/webrtc/builders.py
|
| index 279e19f59f19055df3f29633dc9241d84228c1e4..b00894a0b1e37ea7f859394bbebaec74a1a84423 100644
|
| --- a/scripts/slave/recipe_modules/webrtc/builders.py
|
| +++ b/scripts/slave/recipe_modules/webrtc/builders.py
|
| @@ -95,23 +95,21 @@ BUILDERS = freeze({
|
| 'bot_type': 'builder_tester',
|
| 'testing': {'platform': 'win'},
|
| },
|
| - 'Win64 Debug (GN)': {
|
| + 'Win64 Debug (GYP)': {
|
| 'recipe_config': 'webrtc',
|
| 'chromium_config_kwargs': {
|
| 'BUILD_CONFIG': 'Debug',
|
| 'TARGET_BITS': 64,
|
| },
|
| - 'chromium_apply_config': ['webrtc_gn'],
|
| 'bot_type': 'builder',
|
| 'testing': {'platform': 'win'},
|
| },
|
| - 'Win64 Release (GN)': {
|
| + 'Win64 Release (GYP)': {
|
| 'recipe_config': 'webrtc',
|
| 'chromium_config_kwargs': {
|
| 'BUILD_CONFIG': 'Release',
|
| 'TARGET_BITS': 64,
|
| },
|
| - 'chromium_apply_config': ['webrtc_gn'],
|
| 'bot_type': 'builder',
|
| 'testing': {'platform': 'win'},
|
| },
|
| @@ -211,23 +209,21 @@ BUILDERS = freeze({
|
| 'bot_type': 'builder_tester',
|
| 'testing': {'platform': 'mac'},
|
| },
|
| - 'Mac64 Debug (GN)': {
|
| + 'Mac64 Debug (GYP)': {
|
| 'recipe_config': 'webrtc',
|
| 'chromium_config_kwargs': {
|
| 'BUILD_CONFIG': 'Debug',
|
| 'TARGET_BITS': 64,
|
| },
|
| - 'chromium_apply_config': ['webrtc_gn'],
|
| 'bot_type': 'builder',
|
| 'testing': {'platform': 'mac'},
|
| },
|
| - 'Mac64 Release (GN)': {
|
| + 'Mac64 Release (GYP)': {
|
| 'recipe_config': 'webrtc',
|
| 'chromium_config_kwargs': {
|
| 'BUILD_CONFIG': 'Release',
|
| 'TARGET_BITS': 64,
|
| },
|
| - 'chromium_apply_config': ['webrtc_gn'],
|
| 'bot_type': 'builder',
|
| 'testing': {'platform': 'mac'},
|
| },
|
| @@ -271,23 +267,21 @@ BUILDERS = freeze({
|
| 'bot_type': 'builder_tester',
|
| 'testing': {'platform': 'linux'},
|
| },
|
| - 'Linux64 Debug (GN)': {
|
| + 'Linux64 Debug (GYP)': {
|
| 'recipe_config': 'webrtc',
|
| 'chromium_config_kwargs': {
|
| 'BUILD_CONFIG': 'Debug',
|
| 'TARGET_BITS': 64,
|
| },
|
| - 'chromium_apply_config': ['webrtc_gn'],
|
| 'bot_type': 'builder',
|
| 'testing': {'platform': 'linux'},
|
| },
|
| - 'Linux64 Release (GN)': {
|
| + 'Linux64 Release (GYP)': {
|
| 'recipe_config': 'webrtc',
|
| 'chromium_config_kwargs': {
|
| 'BUILD_CONFIG': 'Release',
|
| 'TARGET_BITS': 64,
|
| },
|
| - 'chromium_apply_config': ['webrtc_gn'],
|
| 'bot_type': 'builder',
|
| 'testing': {'platform': 'linux'},
|
| },
|
| @@ -485,7 +479,7 @@ BUILDERS = freeze({
|
| 'bot_type': 'builder',
|
| 'testing': {'platform': 'linux'},
|
| },
|
| - 'Android32 GN (dbg)': {
|
| + 'Android32 GYP (dbg)': {
|
| 'recipe_config': 'webrtc_android',
|
| 'chromium_config_kwargs': {
|
| 'BUILD_CONFIG': 'Debug',
|
| @@ -493,11 +487,10 @@ BUILDERS = freeze({
|
| 'TARGET_ARCH': 'arm',
|
| 'TARGET_BITS': 32,
|
| },
|
| - 'chromium_apply_config': ['webrtc_gn'],
|
| 'bot_type': 'builder',
|
| 'testing': {'platform': 'linux'},
|
| },
|
| - 'Android32 GN': {
|
| + 'Android32 GYP': {
|
| 'recipe_config': 'webrtc_android',
|
| 'chromium_config_kwargs': {
|
| 'BUILD_CONFIG': 'Release',
|
| @@ -505,7 +498,6 @@ BUILDERS = freeze({
|
| 'TARGET_ARCH': 'arm',
|
| 'TARGET_BITS': 32,
|
| },
|
| - 'chromium_apply_config': ['webrtc_gn'],
|
| 'bot_type': 'builder',
|
| 'testing': {'platform': 'linux'},
|
| },
|
| @@ -775,23 +767,21 @@ BUILDERS = freeze({
|
| 'bot_type': 'builder_tester',
|
| 'testing': {'platform': 'win'},
|
| },
|
| - 'win_x64_gn_dbg': {
|
| + 'win_x64_gyp_dbg': {
|
| 'recipe_config': 'webrtc',
|
| 'chromium_config_kwargs': {
|
| 'BUILD_CONFIG': 'Debug',
|
| 'TARGET_BITS': 64,
|
| },
|
| - 'chromium_apply_config': ['webrtc_gn'],
|
| 'bot_type': 'builder',
|
| 'testing': {'platform': 'win'},
|
| },
|
| - 'win_x64_gn_rel': {
|
| + 'win_x64_gyp_rel': {
|
| 'recipe_config': 'webrtc',
|
| 'chromium_config_kwargs': {
|
| 'BUILD_CONFIG': 'Release',
|
| 'TARGET_BITS': 64,
|
| },
|
| - 'chromium_apply_config': ['webrtc_gn'],
|
| 'bot_type': 'builder',
|
| 'testing': {'platform': 'win'},
|
| },
|
| @@ -917,23 +907,21 @@ BUILDERS = freeze({
|
| 'bot_type': 'builder_tester',
|
| 'testing': {'platform': 'mac'},
|
| },
|
| - 'mac_gn_dbg': {
|
| + 'mac_gyp_dbg': {
|
| 'recipe_config': 'webrtc',
|
| 'chromium_config_kwargs': {
|
| 'BUILD_CONFIG': 'Debug',
|
| 'TARGET_BITS': 64,
|
| },
|
| - 'chromium_apply_config': ['webrtc_gn'],
|
| 'bot_type': 'builder',
|
| 'testing': {'platform': 'mac'},
|
| },
|
| - 'mac_gn_rel': {
|
| + 'mac_gyp_rel': {
|
| 'recipe_config': 'webrtc',
|
| 'chromium_config_kwargs': {
|
| 'BUILD_CONFIG': 'Release',
|
| 'TARGET_BITS': 64,
|
| },
|
| - 'chromium_apply_config': ['webrtc_gn'],
|
| 'bot_type': 'builder',
|
| 'testing': {'platform': 'mac'},
|
| },
|
| @@ -1003,23 +991,21 @@ BUILDERS = freeze({
|
| 'bot_type': 'builder_tester',
|
| 'testing': {'platform': 'linux'},
|
| },
|
| - 'linux_gn_dbg': {
|
| + 'linux_gyp_dbg': {
|
| 'recipe_config': 'webrtc',
|
| 'chromium_config_kwargs': {
|
| 'BUILD_CONFIG': 'Debug',
|
| 'TARGET_BITS': 64,
|
| },
|
| - 'chromium_apply_config': ['webrtc_gn'],
|
| 'bot_type': 'builder',
|
| 'testing': {'platform': 'linux'},
|
| },
|
| - 'linux_gn_rel': {
|
| + 'linux_gyp_rel': {
|
| 'recipe_config': 'webrtc',
|
| 'chromium_config_kwargs': {
|
| 'BUILD_CONFIG': 'Release',
|
| 'TARGET_BITS': 64,
|
| },
|
| - 'chromium_apply_config': ['webrtc_gn'],
|
| 'bot_type': 'builder',
|
| 'testing': {'platform': 'linux'},
|
| },
|
| @@ -1258,7 +1244,7 @@ BUILDERS = freeze({
|
| 'bot_type': 'builder_tester',
|
| 'testing': {'platform': 'linux'},
|
| },
|
| - 'android_gn_dbg': {
|
| + 'android_gyp_dbg': {
|
| 'recipe_config': 'webrtc_android',
|
| 'chromium_config_kwargs': {
|
| 'BUILD_CONFIG': 'Debug',
|
| @@ -1266,11 +1252,10 @@ BUILDERS = freeze({
|
| 'TARGET_ARCH': 'arm',
|
| 'TARGET_BITS': 32,
|
| },
|
| - 'chromium_apply_config': ['webrtc_gn'],
|
| 'bot_type': 'builder',
|
| 'testing': {'platform': 'linux'},
|
| },
|
| - 'android_gn_rel': {
|
| + 'android_gyp_rel': {
|
| 'recipe_config': 'webrtc_android',
|
| 'chromium_config_kwargs': {
|
| 'BUILD_CONFIG': 'Release',
|
| @@ -1278,7 +1263,6 @@ BUILDERS = freeze({
|
| 'TARGET_ARCH': 'arm',
|
| 'TARGET_BITS': 32,
|
| },
|
| - 'chromium_apply_config': ['webrtc_gn'],
|
| 'bot_type': 'builder',
|
| 'testing': {'platform': 'linux'},
|
| },
|
|
|