| Index: scripts/slave/recipe_modules/libyuv/builders.py
|
| diff --git a/scripts/slave/recipe_modules/libyuv/builders.py b/scripts/slave/recipe_modules/libyuv/builders.py
|
| index 44a76bff2692a7ed94d97409c343a37f6c80f4d4..034f8235cbf346349d36d2b0924895b81b4def9e 100644
|
| --- a/scripts/slave/recipe_modules/libyuv/builders.py
|
| +++ b/scripts/slave/recipe_modules/libyuv/builders.py
|
| @@ -42,7 +42,7 @@ BUILDERS = freeze({
|
| 'build_gs_bucket': 'chromium-libyuv',
|
| },
|
| 'builders': {
|
| - 'Win32 Debug (VS2010)': {
|
| + 'Win32 Debug (VS2010, GYP)': {
|
| 'recipe_config': 'libyuv',
|
| 'chromium_apply_config': ['msvs2010'],
|
| 'chromium_config_kwargs': {
|
| @@ -52,7 +52,7 @@ BUILDERS = freeze({
|
| 'bot_type': 'builder_tester',
|
| 'testing': {'platform': 'win'},
|
| },
|
| - 'Win32 Release (VS2010)': {
|
| + 'Win32 Release (VS2010, GYP)': {
|
| 'recipe_config': 'libyuv',
|
| 'chromium_apply_config': ['msvs2010'],
|
| 'chromium_config_kwargs': {
|
| @@ -62,7 +62,7 @@ BUILDERS = freeze({
|
| 'bot_type': 'builder_tester',
|
| 'testing': {'platform': 'win'},
|
| },
|
| - 'Win64 Debug (VS2010)': {
|
| + 'Win64 Debug (VS2010, GYP)': {
|
| 'recipe_config': 'libyuv',
|
| 'chromium_apply_config': ['msvs2010'],
|
| 'chromium_config_kwargs': {
|
| @@ -72,7 +72,7 @@ BUILDERS = freeze({
|
| 'bot_type': 'builder_tester',
|
| 'testing': {'platform': 'win'},
|
| },
|
| - 'Win64 Release (VS2010)': {
|
| + 'Win64 Release (VS2010, GYP)': {
|
| 'recipe_config': 'libyuv',
|
| 'chromium_apply_config': ['msvs2010'],
|
| 'chromium_config_kwargs': {
|
| @@ -82,7 +82,7 @@ BUILDERS = freeze({
|
| 'bot_type': 'builder_tester',
|
| 'testing': {'platform': 'win'},
|
| },
|
| - 'Win32 Debug (VS2012)': {
|
| + 'Win32 Debug (VS2012, GYP)': {
|
| 'recipe_config': 'libyuv',
|
| 'chromium_apply_config': ['msvs2012'],
|
| 'chromium_config_kwargs': {
|
| @@ -92,7 +92,7 @@ BUILDERS = freeze({
|
| 'bot_type': 'builder_tester',
|
| 'testing': {'platform': 'win'},
|
| },
|
| - 'Win32 Release (VS2012)': {
|
| + 'Win32 Release (VS2012, GYP)': {
|
| 'recipe_config': 'libyuv',
|
| 'chromium_apply_config': ['msvs2012'],
|
| 'chromium_config_kwargs': {
|
| @@ -102,7 +102,7 @@ BUILDERS = freeze({
|
| 'bot_type': 'builder_tester',
|
| 'testing': {'platform': 'win'},
|
| },
|
| - 'Win64 Debug (VS2012)': {
|
| + 'Win64 Debug (VS2012, GYP)': {
|
| 'recipe_config': 'libyuv',
|
| 'chromium_apply_config': ['msvs2012'],
|
| 'chromium_config_kwargs': {
|
| @@ -112,7 +112,7 @@ BUILDERS = freeze({
|
| 'bot_type': 'builder_tester',
|
| 'testing': {'platform': 'win'},
|
| },
|
| - 'Win64 Release (VS2012)': {
|
| + 'Win64 Release (VS2012, GYP)': {
|
| 'recipe_config': 'libyuv',
|
| 'chromium_apply_config': ['msvs2012'],
|
| 'chromium_config_kwargs': {
|
| @@ -198,26 +198,6 @@ BUILDERS = freeze({
|
| 'bot_type': 'builder_tester',
|
| 'testing': {'platform': 'win'},
|
| },
|
| - 'Win64 Debug (GN)': {
|
| - 'recipe_config': 'libyuv_clang',
|
| - 'chromium_apply_config': ['gn'],
|
| - 'chromium_config_kwargs': {
|
| - 'BUILD_CONFIG': 'Debug',
|
| - 'TARGET_BITS': 64,
|
| - },
|
| - 'bot_type': 'builder',
|
| - 'testing': {'platform': 'win'},
|
| - },
|
| - 'Win64 Release (GN)': {
|
| - 'recipe_config': 'libyuv_clang',
|
| - 'chromium_apply_config': ['gn'],
|
| - 'chromium_config_kwargs': {
|
| - 'BUILD_CONFIG': 'Release',
|
| - 'TARGET_BITS': 64,
|
| - },
|
| - 'bot_type': 'builder',
|
| - 'testing': {'platform': 'win'},
|
| - },
|
| 'Mac64 Debug': {
|
| 'recipe_config': 'libyuv',
|
| 'chromium_config_kwargs': {
|
| @@ -236,9 +216,8 @@ BUILDERS = freeze({
|
| 'bot_type': 'builder_tester',
|
| 'testing': {'platform': 'mac'},
|
| },
|
| - 'Mac64 Debug (GN)': {
|
| + 'Mac64 Debug (GYP)': {
|
| 'recipe_config': 'libyuv',
|
| - 'chromium_apply_config': ['gn'],
|
| 'chromium_config_kwargs': {
|
| 'BUILD_CONFIG': 'Debug',
|
| 'TARGET_BITS': 64,
|
| @@ -246,9 +225,8 @@ BUILDERS = freeze({
|
| 'bot_type': 'builder',
|
| 'testing': {'platform': 'mac'},
|
| },
|
| - 'Mac64 Release (GN)': {
|
| + 'Mac64 Release (GYP)': {
|
| 'recipe_config': 'libyuv',
|
| - 'chromium_apply_config': ['gn'],
|
| 'chromium_config_kwargs': {
|
| 'BUILD_CONFIG': 'Release',
|
| 'TARGET_BITS': 64,
|
| @@ -310,6 +288,28 @@ BUILDERS = freeze({
|
| 'bot_type': 'builder',
|
| 'testing': {'platform': 'mac'},
|
| },
|
| + 'iOS Debug (GYP)': {
|
| + 'recipe_config': 'libyuv_ios',
|
| + 'chromium_config_kwargs': {
|
| + 'BUILD_CONFIG': 'Debug',
|
| + 'TARGET_BITS': 32,
|
| + 'TARGET_ARCH': 'arm',
|
| + 'TARGET_PLATFORM': 'ios',
|
| + },
|
| + 'bot_type': 'builder',
|
| + 'testing': {'platform': 'mac'},
|
| + },
|
| + 'iOS Release (GYP)': {
|
| + 'recipe_config': 'libyuv_ios',
|
| + 'chromium_config_kwargs': {
|
| + 'BUILD_CONFIG': 'Release',
|
| + 'TARGET_BITS': 32,
|
| + 'TARGET_ARCH': 'arm',
|
| + 'TARGET_PLATFORM': 'ios',
|
| + },
|
| + 'bot_type': 'builder',
|
| + 'testing': {'platform': 'mac'},
|
| + },
|
| 'Linux32 Debug': {
|
| 'recipe_config': 'libyuv',
|
| 'chromium_config_kwargs': {
|
| @@ -346,9 +346,8 @@ BUILDERS = freeze({
|
| 'bot_type': 'builder_tester',
|
| 'testing': {'platform': 'linux'},
|
| },
|
| - 'Linux64 Debug (GN)': {
|
| + 'Linux64 Debug (GYP)': {
|
| 'recipe_config': 'libyuv',
|
| - 'chromium_apply_config': ['gn'],
|
| 'chromium_config_kwargs': {
|
| 'BUILD_CONFIG': 'Debug',
|
| 'TARGET_BITS': 64,
|
| @@ -356,9 +355,8 @@ BUILDERS = freeze({
|
| 'bot_type': 'builder',
|
| 'testing': {'platform': 'linux'},
|
| },
|
| - 'Linux64 Release (GN)': {
|
| + 'Linux64 Release (GYP)': {
|
| 'recipe_config': 'libyuv',
|
| - 'chromium_apply_config': ['gn'],
|
| 'chromium_config_kwargs': {
|
| 'BUILD_CONFIG': 'Release',
|
| 'TARGET_BITS': 64,
|
| @@ -523,9 +521,8 @@ BUILDERS = freeze({
|
| 'bot_type': 'builder',
|
| 'testing': {'platform': 'linux'},
|
| },
|
| - 'Android Debug (GN)': {
|
| + 'Android Debug (GYP)': {
|
| 'recipe_config': 'libyuv_android',
|
| - 'chromium_apply_config': ['gn'],
|
| 'chromium_config_kwargs': {
|
| 'BUILD_CONFIG': 'Debug',
|
| 'TARGET_PLATFORM': 'android',
|
| @@ -535,9 +532,8 @@ BUILDERS = freeze({
|
| 'bot_type': 'builder',
|
| 'testing': {'platform': 'linux'},
|
| },
|
| - 'Android Release (GN)': {
|
| + 'Android Release (GYP)': {
|
| 'recipe_config': 'libyuv_android',
|
| - 'chromium_apply_config': ['gn'],
|
| 'chromium_config_kwargs': {
|
| 'BUILD_CONFIG': 'Release',
|
| 'TARGET_PLATFORM': 'android',
|
| @@ -644,9 +640,8 @@ BUILDERS = freeze({
|
| 'bot_type': 'builder_tester',
|
| 'testing': {'platform': 'win'},
|
| },
|
| - 'win_x64_gn': {
|
| + 'win_x64_gyp': {
|
| 'recipe_config': 'libyuv_clang',
|
| - 'chromium_apply_config': ['gn'],
|
| 'chromium_config_kwargs': {
|
| 'BUILD_CONFIG': 'Debug',
|
| 'TARGET_BITS': 64,
|
| @@ -654,9 +649,8 @@ BUILDERS = freeze({
|
| 'bot_type': 'builder',
|
| 'testing': {'platform': 'win'},
|
| },
|
| - 'win_x64_gn_rel': {
|
| + 'win_x64_gyp_rel': {
|
| 'recipe_config': 'libyuv_clang',
|
| - 'chromium_apply_config': ['gn'],
|
| 'chromium_config_kwargs': {
|
| 'BUILD_CONFIG': 'Release',
|
| 'TARGET_BITS': 64,
|
| @@ -682,9 +676,8 @@ BUILDERS = freeze({
|
| 'bot_type': 'builder_tester',
|
| 'testing': {'platform': 'mac'},
|
| },
|
| - 'mac_gn': {
|
| + 'mac_gyp': {
|
| 'recipe_config': 'libyuv',
|
| - 'chromium_apply_config': ['gn'],
|
| 'chromium_config_kwargs': {
|
| 'BUILD_CONFIG': 'Debug',
|
| 'TARGET_BITS': 64,
|
| @@ -692,9 +685,8 @@ BUILDERS = freeze({
|
| 'bot_type': 'builder',
|
| 'testing': {'platform': 'mac'},
|
| },
|
| - 'mac_gn_rel': {
|
| + 'mac_gyp_rel': {
|
| 'recipe_config': 'libyuv',
|
| - 'chromium_apply_config': ['gn'],
|
| 'chromium_config_kwargs': {
|
| 'BUILD_CONFIG': 'Release',
|
| 'TARGET_BITS': 64,
|
| @@ -756,6 +748,28 @@ BUILDERS = freeze({
|
| 'bot_type': 'builder',
|
| 'testing': {'platform': 'mac'},
|
| },
|
| + 'ios_gyp': {
|
| + 'recipe_config': 'libyuv_ios',
|
| + 'chromium_config_kwargs': {
|
| + 'BUILD_CONFIG': 'Debug',
|
| + 'TARGET_BITS': 32,
|
| + 'TARGET_ARCH': 'arm',
|
| + 'TARGET_PLATFORM': 'ios',
|
| + },
|
| + 'bot_type': 'builder',
|
| + 'testing': {'platform': 'mac'},
|
| + },
|
| + 'ios_gyp_rel': {
|
| + 'recipe_config': 'libyuv_ios',
|
| + 'chromium_config_kwargs': {
|
| + 'BUILD_CONFIG': 'Release',
|
| + 'TARGET_BITS': 32,
|
| + 'TARGET_ARCH': 'arm',
|
| + 'TARGET_PLATFORM': 'ios',
|
| + },
|
| + 'bot_type': 'builder',
|
| + 'testing': {'platform': 'mac'},
|
| + },
|
| 'linux': {
|
| 'recipe_config': 'libyuv',
|
| 'chromium_config_kwargs': {
|
| @@ -774,9 +788,8 @@ BUILDERS = freeze({
|
| 'bot_type': 'builder_tester',
|
| 'testing': {'platform': 'linux'},
|
| },
|
| - 'linux_gn': {
|
| + 'linux_gyp': {
|
| 'recipe_config': 'libyuv',
|
| - 'chromium_apply_config': ['gn'],
|
| 'chromium_config_kwargs': {
|
| 'BUILD_CONFIG': 'Debug',
|
| 'TARGET_BITS': 64,
|
| @@ -784,9 +797,8 @@ BUILDERS = freeze({
|
| 'bot_type': 'builder',
|
| 'testing': {'platform': 'linux'},
|
| },
|
| - 'linux_gn_rel': {
|
| + 'linux_gyp_rel': {
|
| 'recipe_config': 'libyuv',
|
| - 'chromium_apply_config': ['gn'],
|
| 'chromium_config_kwargs': {
|
| 'BUILD_CONFIG': 'Release',
|
| 'TARGET_BITS': 64,
|
| @@ -942,9 +954,8 @@ BUILDERS = freeze({
|
| 'bot_type': 'builder',
|
| 'testing': {'platform': 'linux'},
|
| },
|
| - 'android_gn': {
|
| + 'android_gyp': {
|
| 'recipe_config': 'libyuv_android',
|
| - 'chromium_apply_config': ['gn'],
|
| 'chromium_config_kwargs': {
|
| 'BUILD_CONFIG': 'Debug',
|
| 'TARGET_PLATFORM': 'android',
|
| @@ -954,9 +965,8 @@ BUILDERS = freeze({
|
| 'bot_type': 'builder',
|
| 'testing': {'platform': 'linux'},
|
| },
|
| - 'android_gn_rel': {
|
| + 'android_gyp_rel': {
|
| 'recipe_config': 'libyuv_android',
|
| - 'chromium_apply_config': ['gn'],
|
| 'chromium_config_kwargs': {
|
| 'BUILD_CONFIG': 'Release',
|
| 'TARGET_PLATFORM': 'android',
|
|
|