Modify 'build_dir' for run_mb() to avoid double 'Debug'

scripts/slave/recipes/blimp/integration.py

Index: scripts/slave/recipes/blimp/integration.py
diff --git a/scripts/slave/recipes/blimp/integration.py b/scripts/slave/recipes/blimp/integration.py
index 4e24fda91a1e9659b2a1fb8c73b5ee73112756e7..7eff661a3ad9c2484c21065b8b4e63ba54b24724 100644
--- a/scripts/slave/recipes/blimp/integration.py
+++ b/scripts/slave/recipes/blimp/integration.py
@@ -57,20 +57,20 @@ def RunSteps(api):
   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)
+  android_build = api.path['checkout'].join('out-android')

[shenghuazhang, 2016/10/14 21:41:23]

Remove 'Debug' here to avoid double 'Debug' when execute api.chromium.compile

[mikecase (-- gone --), 2016/10/14 21:44:47]

yup, seems like you need to do this.

+  linux_build = api.path['checkout'].join('out-linux')
 
   api.chromium.run_mb(mastername=mastername,
                       buildername=buildername,
-                      build_dir=linux_build,
+                      build_dir=linux_build.join(
+                          api.chromium.c.build_config_fs),
                       phase='engine')
   api.chromium.compile(targets=['blimp'],

[shenghuazhang, 2016/10/14 21:41:23]

api.chromium.compile would add '--target' anyway:

https://cs.chromium.org/chromium/build/scripts/slave/recipe_modules/chromium/...

Have to ensure the 'out_dir' without 'Debug':
https://cs.chromium.org/chromium/build/scripts/slave/recipe_modules/chromium/...

Then the final path equals to the one in api.chromium.run_mb --
build_dir=linux_build.join(api.chromium.c.build_config_fs)

                        out_dir=linux_build)
   api.chromium.run_mb(mastername=mastername,
                       buildername=buildername,
-                      build_dir=android_build,
+                      build_dir=android_build.join(
+                          api.chromium.c.build_config_fs),
                       phase='client')
   api.chromium.compile(targets=['blimp', 'chrome_public_apk'],
                        out_dir=android_build)