Move android buildbot test logic into python

build/android/pylib/instrumentation/apk_info.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.
 
 """Gathers information about APKs."""
 
 import collections
+import constants
 import logging
 import os
 import pickle
 import re
 
 from pylib import cmd_helper
 
 
 # If you change the cached output of proguard, increment this number
 PICKLE_FORMAT_VERSION = 1
 
 def GetPackageNameForApk(apk_path):
   """Returns the package name of the apk file."""
   aapt_output = cmd_helper.GetCmdOutput(
       ['aapt', 'dump', 'badging', apk_path]).split('\n')
   package_name_re = re.compile(r'package: .*name=\'(\S*)\'')
   for line in aapt_output:
     m = package_name_re.match(line)
     if m:
       return m.group(1)
   raise Exception('Failed to determine package name of %s' % apk_path)
 
 
 class ApkInfo(object):
   """Helper class for inspecting APKs."""
 
   def __init__(self, apk_path, jar_path):
-    self._PROGUARD_PATH = os.path.join(os.environ['ANDROID_SDK_ROOT'],
+    sdk_root = os.getenv('ANDROID_SDK_ROOT', constants.ANDROID_SDK_ROOT)
+    self._PROGUARD_PATH = os.path.join(sdk_root,
                                        'tools/proguard/bin/proguard.sh')
     if not os.path.exists(self._PROGUARD_PATH):
       self._PROGUARD_PATH = os.path.join(os.environ['ANDROID_BUILD_TOP'],
                                          'external/proguard/bin/proguard.sh')
     self._PROGUARD_CLASS_RE = re.compile(r'\s*?- Program class:\s*([\S]+)$')
     self._PROGUARD_METHOD_RE = re.compile(r'\s*?- Method:\s*(\S*)[(].*$')
     self._PROGUARD_ANNOTATION_RE = re.compile(r'\s*?- Annotation \[L(\S*);\]:$')
     self._PROGUARD_ANNOTATION_CONST_RE = (
         re.compile(r'\s*?- Constant element value.*$'))
     self._PROGUARD_ANNOTATION_VALUE_RE = re.compile(r'\s*?- \S+? \[(.*)\]$')
@@ skipping 132 matching lines @@
             if self._IsTestMethod(test) and self._AnnotationsMatchFilters(
                 annotation_filter_list, annotations)]
 
   def GetTestMethods(self):
     """Returns a list of all test methods in this apk as Class#testMethod."""
     return self._test_methods
 
   @staticmethod
   def IsPythonDrivenTest(test):
     return 'pythonDrivenTests' in test