Version 1.1.0-dev.5.2

dart/tools/utils.py

 # Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 # for details. All rights reserved. Use of this source code is governed by a
 # BSD-style license that can be found in the LICENSE file.
 
 # This file contains a set of utilities functions used by other Python-based
 # scripts.
 
 import commands
 import os
 import platform
@@ skipping 198 matching lines @@
 
 def GetBuildbotGSUtilPath():
   gsutil = '/b/build/scripts/slave/gsutil'
   if platform.system() == 'Windows':
     gsutil = 'e:\\\\b\\build\\scripts\\slave\\gsutil'
   return gsutil
 
 def GetBuildMode(mode):
   return BUILD_MODES[mode]
 
-
-def GetBuildConf(mode, arch):
-  return '%s%s' % (GetBuildMode(mode), arch.upper())
+def GetBuildConf(mode, arch, conf_os=None):
+  if conf_os == 'android':
+    return '%s%s%s' % (GetBuildMode(mode), conf_os.title(), arch.upper())
+  else:
+    return '%s%s' % (GetBuildMode(mode), arch.upper())
 
 ARCH_GUESS = GuessArchitecture()
 BASE_DIR = os.path.abspath(os.path.join(os.curdir, '..'))
 DART_DIR = os.path.abspath(os.path.join(__file__, '..', '..'))
 
 
 def GetBuildDir(host_os, target_os):
-  build_dir = BUILD_ROOT[host_os]
-  if target_os and target_os != host_os:
-    build_dir = os.path.join(build_dir, target_os)
-  return build_dir
+  return BUILD_ROOT[host_os]
 
 def GetBuildRoot(host_os, mode=None, arch=None, target_os=None):
   build_root = GetBuildDir(host_os, target_os)
   if mode:
     build_root = os.path.join(build_root, GetBuildConf(mode, arch))
   return build_root
 
 def GetBaseDir():
   return BASE_DIR
 
@@ skipping 284 matching lines @@
     os.chdir(self._working_directory)
 
   def __exit__(self, *_):
     print "Enter directory = ", self._old_cwd
     os.chdir(self._old_cwd)
 
 
 if __name__ == "__main__":
   import sys
   Main(sys.argv)