diff --git a/android/buildbot/bb_device_steps.py b/android/buildbot/bb_device_steps.py index 9738361b9..be7b86bd5 100755 --- a/android/buildbot/bb_device_steps.py +++ b/android/buildbot/bb_device_steps.py @@ -312,7 +312,6 @@ def RunWebkitLayoutTests(options): RunCmd([os.path.join(SLAVE_SCRIPTS_DIR, 'chromium', 'archive_layout_test_results.py'), '--results-dir', '../../layout-test-results', - '--build-dir', CHROME_OUT_DIR, '--build-number', build_number, '--builder-name', builder_name, '--gs-bucket', gs_bucket], diff --git a/android/buildbot/bb_host_steps.py b/android/buildbot/bb_host_steps.py index 8fccbda85..d1e9e54b8 100755 --- a/android/buildbot/bb_host_steps.py +++ b/android/buildbot/bb_host_steps.py @@ -76,18 +76,15 @@ def ZipBuild(options): RunCmd([ os.path.join(SLAVE_SCRIPTS_DIR, 'zip_build.py'), '--src-dir', constants.DIR_SOURCE_ROOT, - '--build-dir', SrcPath('out'), '--exclude-files', 'lib.target,gen,android_webview,jingle_unittests'] + bb_utils.EncodeProperties(options), cwd=DIR_BUILD_ROOT) def ExtractBuild(options): bb_annotations.PrintNamedStep('extract_build') - RunCmd( - [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=DIR_BUILD_ROOT) + RunCmd([os.path.join(SLAVE_SCRIPTS_DIR, 'extract_build.py')] + + bb_utils.EncodeProperties(options), + warning_code=1, cwd=DIR_BUILD_ROOT) def FindBugs(options):