Add 2 config names for builder 'Blimp Android Tester'

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': {
     'chromeos.chrome': {
@@ skipping 65 matching lines @@
       'Afl Upload Linux ASan': 'release_afl_asan',
       'Android Cloud Tests': 'android_debug_static_bot_x86',
       'Android Tests (x86 emulator)': 'android_debug_static_bot_x86',
       'Android Builder (dbg)': 'android_debug_static_bot_vr_shell',
       'Android deterministic': 'android_without_codecs_release_bot_minimal_symbols',
       'Android deterministic (dbg)': 'android_debug_bot',
       'Blimp Android Client':
         '//build/args/bots/chromium.fyi/blimp_client_rel.gn',
       'Blimp Linux Engine':
         '//build/args/bots/chromium.fyi/blimp_engine_rel.gn',
+      'Blimp Client Engine Integration': {
+        'client': '//build/args/bots/chromium.fyi/blimp_client_rel.gn',
+        'engine': '//build/args/bots/chromium.fyi/blimp_engine_rel.gn',
+      },
       'Browser Side Navigation Linux': 'release_bot',
       'CFI Linux CF': 'cfi_full_cfi_diag_release_static',
       'CFI Linux ToT': 'cfi_full_clang_tot_release_static',
       'CFI Linux': 'cfi_release_static',
       'CFI Linux Full': 'cfi_full_release_static',
       'Chromium Linux Goma Canary': 'release_bot',
       'Chromium Linux Goma Canary (clobber)': 'release_bot',
       'Chromium Linux Precise Goma LinkTest': 'release_bot',
       'Chromium Linux32 Goma Canary (clobber)': 'release_bot_x86',
       'Chromium Mac 10.10 MacViews': 'mac_views_browser_release_bot',
       'Chromium Mac 10.11': 'release_bot',
       'Chromium Mac 10.11 Force Mac Toolchain': 'release_bot',
       'Chromium Mac 10.9 Goma Canary': 'release_bot',
       'Chromium Mac 10.9 Goma Canary (clobber)': 'release_bot',
       'Chromium Mac 10.9 Goma Canary (dbg)': 'debug_bot',
       'Chromium Mac 10.9 Goma Canary (dbg)(clobber)': 'debug_bot',
-      'Chromium Win PGO Builder': [ 'official_optimize_chrome_pgo_phase_1_x86', 'official_optimize_chrome_pgo_phase_2_x86' ],
-      'Chromium Win x64 PGO Builder': [ 'official_optimize_chrome_pgo_phase_1', 'official_optimize_chrome_pgo_phase_2' ],
+      'Chromium Win PGO Builder': {
+        '0': 'official_optimize_chrome_pgo_phase_1_x86',
+        '1': 'official_optimize_chrome_pgo_phase_2_x86',

[Dirk Pranke, 2016/10/11 00:14:05]

Whoops, these need to be '1' and '2' instead, here and below (see my other
comment).

[shenghuazhang, 2016/10/11 01:09:27]

Done.

+      },
+      'Chromium Win x64 PGO Builder': {
+        '0': 'official_optimize_chrome_pgo_phase_1',
+        '1': 'official_optimize_chrome_pgo_phase_2',
+      },
       'Chromium Windows Analyze': 'windows_analyze',
       'CrWin7Goma': 'release_bot_x86',
       'CrWin7Goma(clbr)': 'shared_release_bot_x86',
       'CrWin7Goma(dbg)': 'debug_bot_x86',
       'CrWin7Goma(dll)': 'shared_release_bot_x86',
 
       # if CrWinClang is modified, please update CrWinClangGoma in the same way.
       'CrWinClang': 'clang_official_release_bot_minimal_symbols_x86',
 
       'CrWinClang(dbg)': 'clang_debug_bot_minimal_symbols_x86',
@@ skipping 276 matching lines @@
 
     'official.desktop': {
       'mac64': 'official',
       'precise64': 'official',
 
       # Currently the official bots set mini_installer_official_deps=1
       # but it's not clear if that's actually used anywhere.
       'win': 'official_x86',
       'win-asan': 'official_syzyasan_x86',
       'win-clang': 'official_clang_x86',
-      'win-pgo': [ 'official_chrome_pgo_phase_1_x86', 'official_chrome_pgo_phase_2_x86' ],
+      'win-pgo': {

[shenghuazhang, 2016/10/08 00:21:19]

Have to change these builder configs as well, due to 'list' type of 'config' is
removed.

+        '0': 'official_chrome_pgo_phase_1_x86',
+        '1': 'official_chrome_pgo_phase_2_x86',
+      },
       'win64': 'official',
       'win64-clang': 'official_clang',
-      'win64-pgo': [ 'official_chrome_pgo_phase_1', 'official_chrome_pgo_phase_2' ],
+      'win64-pgo': {
+        '0': 'official_chrome_pgo_phase_1',
+        '1': 'official_chrome_pgo_phase_2',
+      },
     },
 
     'official.desktop.continuous': {
       'mac beta': 'official',
       'mac stable': 'official',
       'mac trunk': 'official',
       'precise64 beta': 'official',
       'precise64 stable': 'official',
       'precise64 trunk': 'official',
       'win beta': 'official_six_concurrent_links',
@@ skipping 209 matching lines @@
       'win_chromium_syzyasan_rel': 'syzyasan_no_pch_release_x86',
       'win_chromium_x64_rel_ng': 'release_trybot',
       'win_clang': 'win_clang_debug_bot',
       'win_clang_dbg': 'clang_debug_trybot_x86',
       'win_clang_rel': 'clang_official_release_trybot_x86',
       'win_clang_x64_dbg': 'win_clang_debug_bot',
       'win_clang_x64_rel': 'clang_official_release_trybot',
       'win_nacl_sdk': 'release_bot_x86',
       'win_nacl_sdk_build': 'release_bot_x86',
       'win_optional_gpu_tests_rel': 'gpu_tests_deqp_gles_release_trybot_x86',
-      'win_pgo': [ 'official_optimize_chrome_pgo_phase_1_x86', 'official_optimize_chrome_pgo_phase_2_x86' ],
+      'win_pgo': {
+        '0': 'official_optimize_chrome_pgo_phase_1_x86',
+        '1': 'official_optimize_chrome_pgo_phase_2_x86',
+      },
       'win_upload_clang': 'release_bot',
       'win_chrome_official': 'official_goma_x86',
     },
 
     'tryserver.v8': {
       'v8_android_chromium_gn_dbg': 'android_debug_bot',
       'v8_linux_blink_rel': 'release_trybot',
       'v8_linux_chromium_gn_rel': 'release_trybot',
     },
   },
@@ skipping 1130 matching lines @@
       'gn_args': 'target_cpu="x86"',
     },
 
     'drfuzz': { 'gn_args': 'use_drfuzz=true' },
 
     'drmemory': {
       'gn_args': 'is_component_build=true enable_iterator_debugging=false',
     },
   },
 }