Fix compile on the Blimp Client Engine Integration bot

scripts/slave/recipes/blimp/integration.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.
 
 from recipe_engine import recipe_api
 from recipe_engine.recipe_api import Property
 from recipe_engine.types import freeze
 
 DEPS = [
   'chromium',
@@ skipping 21 matching lines @@
       'gclient_apply_config': 'android',
       'gclient_config': 'chromium',
       'target': 'Debug',
     },
   },
 })
 
 REPO_URL = 'https://chromium.googlesource.com/chromium/src.git'
 
 def RunSteps(api):
-  android_build = api.path['slave_build'].join('src', 'out-android', 'Debug')
-  linux_build = api.path['slave_build'].join('src', 'out-linux', 'Debug')
   mastername = api.properties.get('mastername')
   buildername = api.properties.get('buildername')
   builder = BUILDERS[mastername][buildername]
+  api.chromium.set_config('chromium')
   api.chromium_android.configure_from_properties(
       builder['config'],
       REPO_NAME='src',
       REPO_URL=REPO_URL,
       INTERNAL=False,
       BUILD_CONFIG=builder['target'])
 
-  api.chromium.set_config('chromium')
   api.gclient.set_config(builder['gclient_config'])
   api.gclient.apply_config(builder['gclient_apply_config'])
   api.bot_update.ensure_checkout()
   api.chromium.ensure_goma()
   api.chromium_android.clean_local_files()
   api.chromium.runhooks()
 
+  android_build = api.path['checkout'].join(
+                      'out-android',
+                      api.chromium.c.build_config_fs)
+  linux_build = api.path['checkout'].join(
+                    'out-linux',
+                    api.chromium.c.build_config_fs)

[mikecase (-- gone --), 2016/10/14 19:04:14]

Indenting should be either ....


linux_build = api.path['checkout'].join(
    'out-linux', api.chromium.c.build_config_fs)


OR

linux_build = api.path['checkout'].join('out-linux',
                                        api.chromium.c.build_config_fs)


*I prefer the first.

[shenghuazhang, 2016/10/14 19:27:23]

I see. Will do with the first one. Second one is possible to have 80 characters
problem.

+
   api.chromium.run_mb(mastername=mastername,
                       buildername=buildername,
                       build_dir=linux_build,
                       phase='engine')
   api.chromium.compile(targets=['blimp'],
                        out_dir=linux_build)
   api.chromium.run_mb(mastername=mastername,
                       buildername=buildername,
                       build_dir=android_build,
                       phase='client')
   api.chromium.compile(targets=['blimp', 'chrome_public_apk'],
                        out_dir=android_build)
 
 
 def GenTests(api):
   sanitize = lambda s: ''.join(c if c.isalnum() else '_' for c in s)
 
   yield (
-      api.test('%s_test_pass' % sanitize('Blimp Android Tester')) +
+      api.test('%s_test_pass' % sanitize('Blimp Client Engine Integration')) +
       api.properties.generic(
         buildername='Blimp Client Engine Integration',
         mastername='chromium.fyi')
   )