Add 2 config names for builder 'Blimp Android Tester'

tools/mb/mb_config.pyl

Index: tools/mb/mb_config.pyl
diff --git a/tools/mb/mb_config.pyl b/tools/mb/mb_config.pyl
index f614bc3fd2a4061fe1263b85bde0a5cad84dcb3b..85105191a240f3255d6236809e2d4d4a1074ad66 100644
--- a/tools/mb/mb_config.pyl
+++ b/tools/mb/mb_config.pyl
@@ -83,6 +83,10 @@
         '//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': 'blimp_chromium_fyi_android_client',

[jbudorick, 2016/10/07 19:22:01]

Can these two just directly reference the files?

[Dirk Pranke, 2016/10/07 19:25:29]

Oh, I missed that :(.

I'd be surprised if this even works. I'd expect that if you want to use a file,
you might *have* to list it directly here, like we do in the single-config case.

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

Oh I see. Will replace the configs with the direct file path.

+        'engine': 'blimp_chromium_fyi_linux_engine',
+      },
       'Browser Side Navigation Linux': 'release_bot',
       'CFI Linux CF': 'cfi_full_cfi_diag_release_static',
       'CFI Linux ToT': 'cfi_full_clang_tot_release_static',
@@ -630,7 +634,10 @@
       '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': {
+        'pgo_phase_1': 'official_optimize_chrome_pgo_phase_1_x86',
+        'pgo_phase_2': 'official_optimize_chrome_pgo_phase_2_x86',

[Dirk Pranke, 2016/10/07 19:01:59]

There's also a PGO builder on the official.desktop master (line 402), and
unfortunately that one needs to build across trunk/beta/stable, and the recipe
for it isn't pinned. In other words, we can't easily change the command line it
passes to MB.

I think things will still work if we just change the keys to '0' and '1'; they
aren't good names, but it'll get the job done and we can worry about changing
the names later.

Does that make sense?

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

Yeah, I think change keys to '0' and '1' is a good way for now (if that works),
since things are not as simple as just change the command line in the mb config
here.

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

Ah, sorry, I was wrong about this. The PGO builders are passing in '1' and '2',
not '0' and '1'; the indexes are 1-based, because I thought 0-based looked
stupid at the time :).

+      },
       'win_upload_clang': 'release_bot',
       'win_chrome_official': 'official_goma_x86',
     },
@@ -897,6 +904,14 @@
       'asan', 'lsan', 'release_trybot',
     ],
 
+    'blimp_chromium_fyi_android_client': [
+      'blimp_client_rel'
+    ],
+
+    'blimp_chromium_fyi_linux_engine': [
+      'blimp_engine_rel'
+    ],
+
     'cast_release_bot': [
       'cast', 'release_bot',
     ],
@@ -1451,6 +1466,14 @@
       'gn_args': 'blink_logging_always_on=true',
     },
 
+    'blimp_client_rel': {
+       'gn_args': '//build/args/bots/chromium.fyi/blimp_client_rel.gn',
+    },
+
+    'blimp_engine_rel': {
+       'gn_args': '//build/args/bots/chromium.fyi/blimp_engine_rel.gn',
+    },
+
     'ffmpeg_branding_chrome': {
       'gn_args': 'ffmpeg_branding="Chrome"',
     },