preserve GN_Android in compile -> test mapper

infra/bots/recipes/swarm_trigger.py

 # Copyright 2016 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 
 # Recipe module for Skia Swarming trigger.
 
 
 import os
 import json
@@ skipping 30 matching lines @@
       'Build-Ubuntu-GCC-x86_64-Debug-GN',
       'Build-Ubuntu-GCC-x86_64-Release-RemoteRun',
       'Build-Ubuntu-GCC-x86_64-Release-Trybot',
       'Build-Win-MSVC-x86_64-Release',
       'Build-Win-MSVC-x86_64-Release-Vulkan',
       'Housekeeper-Nightly-RecreateSKPs_Canary',
       'Housekeeper-PerCommit',
       'Infra-PerCommit',
       'Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Trybot',
       'Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_1k_SKPs',
+      'Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Debug-GN_Android',
       'Test-Android-GCC-NVIDIA_Shield-GPU-TegraX1-Arm64-Debug-Vulkan',
       'Test-Android-GCC-Nexus7v2-GPU-Tegra3-Arm7-Release',
       'Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release',
       'Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot',
       'Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug',
       'Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN',
       'Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared',
       'Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind',
       'Test-Win8-MSVC-ShuttleA-GPU-HD7770-x86_64-Release',
       'Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release',
       'Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Release',
     ],
   },
 }
 
 
 def derive_compile_bot_name(api):
   builder_name = api.properties['buildername']
   builder_cfg = api.builder_name_schema.DictForBuilderName(builder_name)
   if builder_cfg['role'] == 'Housekeeper':
     return 'Build-Ubuntu-GCC-x86_64-Release-Shared'
   if builder_cfg['role'] in ('Test', 'Perf'):
     task_os = builder_cfg['os']
     extra_config = builder_cfg.get('extra_config')
     if task_os == 'Android':
       if extra_config == 'Vulkan':
         extra_config = '%s_%s' % (task_os, 'Vulkan')
+      elif extra_config == 'GN_Android':
+        pass  # i.e. extra_config stays GN_Android
       else:
         extra_config = task_os
       task_os = 'Ubuntu'
     elif task_os == 'iOS':
       extra_config = task_os
       task_os = 'Mac'
     elif 'Win' in task_os:
       task_os = 'Win'
     return api.builder_name_schema.MakeBuilderName(
         role=api.builder_name_schema.BUILDER_ROLE_BUILD,
@@ skipping 720 matching lines @@
           mastername='client.skia',
           slavename='skiabot-linux-swarm-000',
           buildnumber=5,
           path_config='kitchen',
           revision='abc123',
           **gerrit_kwargs) +
       api.step_data(
           'upload new .isolated file for test_skia',
           stdout=api.raw_io.output('def456 XYZ.isolated'))
   )