[Android] Reenable findbugs on android_clang_dbg_recipe and Android Clang Builder (dbg).

tools/mb/mb_config.pyl

 # Copyright 2015 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.
 
 {
   # This is a map of buildbot master names -> buildbot builder names ->
   # config names (where each config name is a key in the 'configs' dict,
   # below). MB uses this dict to look up which config to use for a given bot.
   'masters': {
     # Take care when changing any of these builders to ensure that you do not
@@ skipping 253 matching lines @@
       'Linux Release (ATI)': 'none',
       'Linux Release (Intel Graphics Stack)': 'none',
       'Linux Release (NVIDIA)': 'none',
     },
 
     'chromium.linux': {
       'Android Arm64 Builder (dbg)':
         'swarming_android_gyp_debug_static_bot_arm64',
       'Android Builder (dbg)': 'swarming_android_gyp_debug_static_bot',
       'Android Builder': 'swarming_android_gyp_release_bot_minimal_symbols',
-      'Android Clang Builder (dbg)': 'android_clang_asan_gyp_debug_bot',
+      'Android Clang Builder (dbg)': 'android_clang_asan_findbugs_gyp_debug_bot',
       'Android GN (dbg)': 'android_gn_debug_bot',
       'Android GN': 'android_gn_release_bot_minimal_symbols',
       'Android Tests (dbg)': 'swarming_android_gyp_debug_static_bot',
       'Android Tests': 'swarming_android_gyp_release_bot_minimal_symbols',
       'Cast Android (dbg)': 'android_cast_gyp_debug_static_bot',
       'Cast Linux': 'cast_gn_release_bot',
       'Linux Builder (dbg)': 'swarming_gn_debug_bot',
       'Linux Builder (dbg)(32)': 'swarming_gyp_debug_bot_no_symbols_x86',
       'Linux Builder': 'swarming_gn_release_bot',
       'Linux Tests (dbg)(1)': 'none',
@@ skipping 345 matching lines @@
       'android_chromium_variable': 'tbd',
       'android_coverage': 'tbd',
       'android_cronet_tester': 'tbd',
       'android_deterministic': 'tbd',
       'cast_shell_android': 'tbd',
 
       'android_arm64_dbg_recipe': 'swarming_android_gyp_debug_trybot_arm64',
       'android_chromium_gn_compile_dbg': 'android_gn_debug_trybot',
       'android_chromium_gn_compile_rel': 'android_gn_release_trybot',
       'android_chromium_gn_rel': 'android_gn_release_trybot',
-      'android_clang_dbg_recipe': 'android_clang_asan_gyp_debug_trybot',
+      'android_clang_dbg_recipe': 'android_clang_asan_findbugs_gyp_debug_trybot',
       'android_compile_dbg': 'swarming_android_gyp_debug_trybot',
       'android_compile_mips_dbg': 'android_gn_debug_trybot_mipsel',
       'android_compile_rel': 'swarming_android_gyp_release_trybot',
       'android_compile_x64_dbg': 'android_gn_debug_trybot_x64',
       'android_compile_x86_dbg': 'android_gn_debug_trybot_x86',
       'linux_android_dbg_ng': 'swarming_android_gyp_debug_trybot',
       'linux_android_rel_ng': 'swarming_android_gyp_release_trybot',
     },
 
     'tryserver.chromium.angle': {
@@ skipping 174 matching lines @@
   # This is the list of configs that you can pass to mb; each config
   # represents a particular combination of GYP_DEFINES/gn args that
   # we must support. A given config *may* be platform-specific but
   # is not necessarily so (i.e., we might have mac, win, and linux
   # bots all using the 'gn_release_bot' config).
   'configs': {
     'android_cast_gyp_debug_static_bot': [
       'android', 'cast', 'gyp', 'debug_static_bot',
     ],
 
-    'android_clang_asan_gyp_debug_bot': [
-      'android', 'clang', 'asan', 'gyp', 'debug_bot',
+    'android_clang_asan_findbugs_gyp_debug_bot': [
+      'android', 'clang', 'asan', 'findbugs', 'gyp', 'debug_bot',
     ],
 
-    'android_clang_asan_gyp_debug_trybot': [
-      'android', 'clang', 'asan', 'gyp', 'debug_trybot',
+    'android_clang_asan_findbugs_gyp_debug_trybot': [
+      'android', 'clang', 'asan', 'findbugs', 'gyp', 'debug_trybot',
     ],
 
     'android_gn_debug_bot': [
       'android', 'gn', 'debug_bot',
     ],
 
     'android_gn_debug_static_bot': [
       'android', 'gn', 'debug_static_bot',
     ],
 
@@ skipping 610 matching lines @@
 
     # This mixin is used to force configs that use it to fail. It
     # is used in two cases: when we have bots that we haven't looked
     # at yet and don't know whether they need MB or not, and for bots
     # that are test-only and should never run MB.
     'error': {
       'gn_args': 'error',
       'gyp_defines': 'target_arch=unknown',
     },
 
+    'findbugs': {
+      'gn_args': 'run_findbugs=true',
+      'gyp_defines': 'run_findbugs=1',
+    },
+
     'gn_linux_upload': {
       'type': 'gn',
 
       # We don't want to require a runtime dependency on glib in the
       # GN binary; ideally we could just turn glib off, but that doesn't
       # actually work, so we need to pretend to be doing an ozone build
       # in order for the flag to actually take effect.
       'gn_args': 'use_ozone=true',
     },
 
@@ skipping 136 matching lines @@
       'gn_args': 'is_component_build=true enable_iterator_debugging=false',
       'gyp_defines': 'component=shared_library build_for_tool=drmemory',
     },
 
     'valgrind': {
       # TODO: add gn_args for 'build_for_tool=memcheck'
       'gyp_defines': 'build_for_tool=memcheck',
     }
   },
 }