| Index: scripts/slave/recipe_modules/chromium_tests/chromium_gpu_fyi.py
|
| diff --git a/scripts/slave/recipe_modules/chromium_tests/chromium_gpu_fyi.py b/scripts/slave/recipe_modules/chromium_tests/chromium_gpu_fyi.py
|
| index 37a1927051048ab728e429bcc28c11da972380a4..af5a7c99e54481064bc9b3f7fd55e91bbaf9895b 100644
|
| --- a/scripts/slave/recipe_modules/chromium_tests/chromium_gpu_fyi.py
|
| +++ b/scripts/slave/recipe_modules/chromium_tests/chromium_gpu_fyi.py
|
| @@ -751,13 +751,13 @@ SPEC = {
|
| },
|
| 'enable_swarming': True,
|
| },
|
| - 'Android Debug (Nexus 5)': {
|
| + 'Android Release (Nexus 5)': {
|
| 'chromium_config': 'android',
|
| 'chromium_apply_config': ['chrome_with_codecs', 'mb'],
|
| 'gclient_config': 'chromium',
|
| 'gclient_apply_config': ['android'],
|
| 'chromium_config_kwargs': {
|
| - 'BUILD_CONFIG': 'Debug',
|
| + 'BUILD_CONFIG': 'Release',
|
| 'TARGET_BITS': 32,
|
| 'TARGET_PLATFORM': 'android',
|
| },
|
| @@ -776,30 +776,7 @@ SPEC = {
|
| 'use_isolate': False,
|
| 'enable_swarming': False,
|
| },
|
| - 'Android Debug (Nexus 5X)': {
|
| - 'chromium_config': 'android',
|
| - 'chromium_apply_config': ['chrome_with_codecs'],
|
| - 'gclient_config': 'chromium',
|
| - 'gclient_apply_config': ['android'],
|
| - 'chromium_config_kwargs': {
|
| - 'TARGET_PLATFORM': 'android',
|
| - },
|
| - 'android_config': 'arm64_builder_mb',
|
| - 'bot_type': 'builder_tester',
|
| - 'compile_targets': [
|
| - ],
|
| - 'test_generators': [
|
| - steps.generate_gtest,
|
| - steps.generate_isolated_script,
|
| - steps.generate_script,
|
| - ],
|
| - 'testing': {
|
| - 'platform': 'linux',
|
| - },
|
| - 'use_isolate': False,
|
| - 'enable_swarming': False,
|
| - },
|
| - 'Android Swarmed Debug (Nexus 5X)': {
|
| + 'Android Release (Nexus 5X)': {
|
| 'chromium_config': 'android',
|
| 'chromium_apply_config': ['chrome_with_codecs'],
|
| 'gclient_config': 'chromium',
|
| @@ -807,7 +784,7 @@ SPEC = {
|
| 'chromium_config_kwargs': {
|
| 'TARGET_PLATFORM': 'android',
|
| },
|
| - 'android_config': 'arm64_builder_mb',
|
| + 'android_config': 'arm64_builder_rel_mb',
|
| 'bot_type': 'builder_tester',
|
| 'compile_targets': [
|
| ],
|
| @@ -822,13 +799,13 @@ SPEC = {
|
| 'use_isolate': True,
|
| 'enable_swarming': True,
|
| },
|
| - 'Android Debug (Nexus 6)': {
|
| + 'Android Release (Nexus 6)': {
|
| 'chromium_config': 'android',
|
| 'chromium_apply_config': ['chrome_with_codecs', 'mb'],
|
| 'gclient_config': 'chromium',
|
| 'gclient_apply_config': ['android'],
|
| 'chromium_config_kwargs': {
|
| - 'BUILD_CONFIG': 'Debug',
|
| + 'BUILD_CONFIG': 'Release',
|
| 'TARGET_BITS': 32,
|
| 'TARGET_PLATFORM': 'android',
|
| },
|
| @@ -847,17 +824,15 @@ SPEC = {
|
| 'use_isolate': False,
|
| 'enable_swarming': False,
|
| },
|
| - 'Android Debug (Nexus 6P)': {
|
| + 'Android Release (Nexus 6P)': {
|
| 'chromium_config': 'android',
|
| - 'chromium_apply_config': ['chrome_with_codecs', 'mb'],
|
| + 'chromium_apply_config': ['chrome_with_codecs'],
|
| 'gclient_config': 'chromium',
|
| 'gclient_apply_config': ['android'],
|
| 'chromium_config_kwargs': {
|
| - 'BUILD_CONFIG': 'Debug',
|
| - 'TARGET_BITS': 32,
|
| 'TARGET_PLATFORM': 'android',
|
| },
|
| - 'android_config': 'main_builder',
|
| + 'android_config': 'arm64_builder_rel_mb',
|
| 'bot_type': 'builder_tester',
|
| 'compile_targets': [
|
| ],
|
| @@ -872,7 +847,7 @@ SPEC = {
|
| 'use_isolate': False,
|
| 'enable_swarming': False,
|
| },
|
| - 'Android Debug (Nexus 9)': {
|
| + 'Android Release (Nexus 9)': {
|
| 'chromium_config': 'android',
|
| 'chromium_apply_config': ['chrome_with_codecs'],
|
| 'gclient_config': 'chromium',
|
| @@ -880,7 +855,7 @@ SPEC = {
|
| 'chromium_config_kwargs': {
|
| 'TARGET_PLATFORM': 'android',
|
| },
|
| - 'android_config': 'arm64_builder_mb',
|
| + 'android_config': 'arm64_builder_rel_mb',
|
| 'bot_type': 'builder_tester',
|
| 'compile_targets': [
|
| ],
|
|
|