android: run zip/extract/compile steps in the parent of src/, like on other platforms.

build/android/buildbot/bb_host_steps.py

 #!/usr/bin/env python
 # Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import os
 import sys
 
 import bb_utils
 import bb_annotations
@@ skipping 40 matching lines @@
 def Compile(options):
   RunHooks(options.target)
   cmd = [os.path.join(SLAVE_SCRIPTS_DIR, 'compile.py'),
          '--build-tool=ninja',
          '--compiler=goma',
          '--target=%s' % options.target,
          '--goma-dir=%s' % bb_utils.GOMA_DIR]
   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)

[Nico, 2013/10/22 02:41:00]

Oh hmm, I guess I should do the same here?

   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)
+      RunCmd(cmd + ['--build-args=%s' % compile_target],
+             flunk_on_failure=False,
+             cwd=constants.DIR_SOURCE_ROOT)
 
 
 def ZipBuild(options):
   bb_annotations.PrintNamedStep('zip_build')
   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))
+      + bb_utils.EncodeProperties(options), cwd=constants.DIR_SOURCE_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)
+       warning_code=1, cwd=constants.DIR_SOURCE_ROOT)
 
 
 def FindBugs(options):
   bb_annotations.PrintNamedStep('findbugs')
   build_type = []
   if options.target == 'Release':
     build_type = ['--release-build']
   RunCmd([SrcPath('build', 'android', 'findbugs_diff.py')] + build_type)
   RunCmd([SrcPath(
       'tools', 'android', 'findbugs_plugin', 'test',
@@ skipping 43 matching lines @@
     return sys.exit('Unused args %s' % args)
 
   setattr(options, 'target', options.factory_properties.get('target', 'Debug'))
 
   if options.steps:
     bb_utils.RunSteps(options.steps.split(','), GetHostStepCmds(), options)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))