[android] Adds constants.GetOutDirectory() and converts test scripts to use it.

build/android/pylib/constants.py

 # Copyright (c) 2012 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.
 
 """Defines a set of constants shared by test runners and other scripts."""
 
 import os
 import subprocess
 import sys
 
@@ skipping 76 matching lines @@
   try:
     return os.environ['BUILDTYPE']
   except KeyError:
     raise Exception('The BUILDTYPE environment variable has not been set')
 
 
 def SetBuildType(build_type):
   os.environ['BUILDTYPE'] = build_type
 
 
+def GetBuildDirectory():
+  return os.path.abspath(
+      os.path.join(cmd_helper.OutDirectory.get(), GetBuildType()))

[frankf, 2013/08/21 01:50:07]

Remove cmd_helper.OutDirectory alltogether.

[craigdh, 2013/08/22 22:09:42]

Done.

+
+
 def _GetADBPath():
   if os.environ.get('ANDROID_SDK_ROOT'):
     return 'adb'
   # If envsetup.sh hasn't been sourced and there's no adb in the path,
   # set it here.
   try:
     with file(os.devnull, 'w') as devnull:
       subprocess.call(['adb', 'version'], stdout=devnull, stderr=devnull)
     return 'adb'
   except OSError:
     print >> sys.stderr, 'No adb found in $PATH, fallback to checked in binary.'
     return os.path.join(ANDROID_SDK_ROOT, 'platform-tools', 'adb')
 
 
 ADB_PATH = _GetADBPath()
 
 # Exit codes
 ERROR_EXIT_CODE = 1
 WARNING_EXIT_CODE = 88