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

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

Issue 2415963004: Fix compile on the Blimp Client Engine Integration bot (Closed)
Patch Set: 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
« no previous file with comments | « no previous file | scripts/slave/recipes/blimp/integration.expected/Blimp_Android_Tester_test_pass.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..d7a01923c9b06437c4e3f86dd04224c570864566 100644
--- a/scripts/slave/recipes/blimp/integration.py
+++ b/scripts/slave/recipes/blimp/integration.py
@@ -39,8 +39,8 @@ 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('src', 'out-android')
mikecase (-- gone --) 2016/10/14 02:25:36 need to change these paths to api.path['checkout']
shenghuazhang 2016/10/14 03:21:19 Done.
+ linux_build = api.path['checkout'].join('src', 'out-linux')
mastername = api.properties.get('mastername')
buildername = api.properties.get('buildername')
builder = BUILDERS[mastername][buildername]
@@ -64,12 +64,14 @@ def RunSteps(api):
build_dir=linux_build,
phase='engine')
api.chromium.compile(targets=['blimp'],
+ target=builder['target'],
mikecase (-- gone --) 2016/10/14 02:25:36 you don't need to specify this explicitly. This do
shenghuazhang 2016/10/14 03:21:19 Done.
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'],
+ target=builder['target'],
out_dir=android_build)
« no previous file with comments | « no previous file | scripts/slave/recipes/blimp/integration.expected/Blimp_Android_Tester_test_pass.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698