Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1960)

Unified Diff: scripts/slave/recipes/blimp/integration.py

Issue 2415963004: Fix compile on the Blimp Client Engine Integration bot (Closed)
Patch Set: call chromium.set_config first Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: scripts/slave/recipes/blimp/integration.py
diff --git a/scripts/slave/recipes/blimp/integration.py b/scripts/slave/recipes/blimp/integration.py
index a07e7ba2129d421e05bec0ea525ac1638ae83c68..52650fd706d1c47d624d7bcc6950d6f38e291463 100644
--- a/scripts/slave/recipes/blimp/integration.py
+++ b/scripts/slave/recipes/blimp/integration.py
@@ -39,11 +39,12 @@ BUILDERS = freeze({
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')
+ android_build = api.path['checkout'].join('out-android')
+ linux_build = api.path['checkout'].join('out-linux')
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',
@@ -51,7 +52,6 @@ def RunSteps(api):
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()

Powered by Google App Engine
This is Rietveld 408576698