add gn_android_flavor

infra/bots/recipes/swarm_compile.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 compile.
 
 
 DEPS = [
   'core',
   'recipe_engine/json',
   'recipe_engine/path',
   'recipe_engine/platform',
   'recipe_engine/properties',
   'recipe_engine/python',
   'flavor',
   'run',
   'vars',
 ]
 
 
 TEST_BUILDERS = {
   'client.skia.compile': {
     'skiabot-linux-swarm-000': [
       'Build-Mac-Clang-Arm7-Debug-Android',
       'Build-Mac-Clang-Arm7-Release-iOS',
+      'Build-Mac-Clang-mipsel-Debug-GN_Android',
       'Build-Mac-Clang-x86_64-Debug-CommandBuffer',
       'Build-Mac-Clang-x86_64-Release-CMake',
+      'Build-Ubuntu-Clang-arm64-Release-GN_Android',
       'Build-Ubuntu-Clang-x86_64-Debug-GN',
       'Build-Ubuntu-GCC-Arm7-Debug-Android-Trybot',
       'Build-Ubuntu-GCC-Arm7-Debug-Android_FrameworkDefs',
       'Build-Ubuntu-GCC-Arm7-Debug-Android_NoNeon',
       'Build-Ubuntu-GCC-Arm7-Release-Android',
       'Build-Ubuntu-GCC-Arm7-Release-Android_Vulkan',
       'Build-Ubuntu-GCC-x86-Debug',
+      'Build-Ubuntu-GCC-x86_64-Debug-GN',
       'Build-Ubuntu-GCC-x86_64-Debug-MSAN',
-      'Build-Ubuntu-GCC-x86_64-Debug-GN',
       'Build-Ubuntu-GCC-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE',
       'Build-Ubuntu-GCC-x86_64-Release-ANGLE',
       'Build-Ubuntu-GCC-x86_64-Release-CMake',
       'Build-Ubuntu-GCC-x86_64-Release-Fast',
       'Build-Ubuntu-GCC-x86_64-Release-Mesa',
       'Build-Ubuntu-GCC-x86_64-Release-PDFium',
       'Build-Ubuntu-GCC-x86_64-Release-Shared',
       'Build-Ubuntu-GCC-x86_64-Release-Valgrind',
       'Build-Win-MSVC-x86-Debug',
       'Build-Win-MSVC-x86-Debug-Exceptions',
@@ skipping 191 matching lines @@
         if 'Win' in builder:
           test += api.platform('win', 64)
         elif 'Mac' in builder:
           test += api.platform('mac', 64)
         else:
           test += api.platform('linux', 64)
         if 'Android' in builder or ('GN' in builder and 'Win' not in builder):
           ccache = '/usr/bin/ccache'
           test += api.step_data('has ccache?',
                                 stdout=api.json.output({'ccache':ccache}))
-        if 'Android' in builder:
+        if 'Android' in builder and 'GN_Android' not in builder:
           test += api.step_data(
             'which adb',
             retcode=1)
         if 'Trybot' in builder:
           test += api.properties(issue=500,
                                  patchset=1,
                                  rietveld='https://codereview.chromium.org')
 
         yield test
 
@@ skipping 62 matching lines @@
           buildername=buildername + '-Trybot',
           mastername=mastername,
           slavename=slavename,
           buildnumber=5,
           path_config='kitchen',
           swarm_out_dir='[SWARM_OUT_DIR]',
           revision='abc123',
           **gerrit_kwargs) +
       api.platform('win', 64)
   )