Index: build/android/buildbot/bb_host_steps.py |
diff --git a/build/android/buildbot/bb_host_steps.py b/build/android/buildbot/bb_host_steps.py |
index 5acbaa6435c239b61f0a2f85f3a48ad975749ac0..8fccbda85167e03ea8a5c77f2ed226a66a1ec74e 100755 |
--- a/build/android/buildbot/bb_host_steps.py |
+++ b/build/android/buildbot/bb_host_steps.py |
@@ -17,6 +17,8 @@ SLAVE_SCRIPTS_DIR = os.path.join(bb_utils.BB_BUILD_DIR, 'scripts', 'slave') |
VALID_HOST_TESTS = set(['check_webview_licenses', 'findbugs']) |
EXPERIMENTAL_TARGETS = ['android_experimental'] |
+DIR_BUILD_ROOT = os.path.dirname(constants.DIR_SOURCE_ROOT) |
+ |
# Short hand for RunCmd which is used extensively in this file. |
RunCmd = bb_utils.RunCmd |
@@ -58,13 +60,15 @@ def Compile(options): |
build_targets = options.build_targets.split(',') |
bb_annotations.PrintNamedStep('compile') |
for build_target in build_targets: |
- RunCmd(cmd + ['--build-args=%s' % build_target], halt_on_failure=True) |
+ RunCmd(cmd + ['--build-args=%s' % build_target], |
+ halt_on_failure=True, |
+ cwd=DIR_BUILD_ROOT) |
if options.experimental: |
for compile_target in EXPERIMENTAL_TARGETS: |
bb_annotations.PrintNamedStep('Experimental Compile %s' % compile_target) |
RunCmd(cmd + ['--build-args=%s' % compile_target], |
flunk_on_failure=False, |
- cwd=constants.DIR_SOURCE_ROOT) |
+ cwd=DIR_BUILD_ROOT) |
def ZipBuild(options): |
@@ -74,7 +78,7 @@ def ZipBuild(options): |
'--src-dir', constants.DIR_SOURCE_ROOT, |
'--build-dir', SrcPath('out'), |
'--exclude-files', 'lib.target,gen,android_webview,jingle_unittests'] |
- + bb_utils.EncodeProperties(options), cwd=constants.DIR_SOURCE_ROOT) |
+ + bb_utils.EncodeProperties(options), cwd=DIR_BUILD_ROOT) |
def ExtractBuild(options): |
@@ -83,7 +87,7 @@ def ExtractBuild(options): |
[os.path.join(SLAVE_SCRIPTS_DIR, 'extract_build.py'), |
'--build-dir', SrcPath('build'), '--build-output-dir', |
SrcPath('out')] + bb_utils.EncodeProperties(options), |
- warning_code=1, cwd=constants.DIR_SOURCE_ROOT) |
+ warning_code=1, cwd=DIR_BUILD_ROOT) |
def FindBugs(options): |