[Android] Sever findbugs dependencies on environment variables.

build/android/pylib/findbugs.py

Index: build/android/pylib/findbugs.py
diff --git a/build/android/pylib/findbugs.py b/build/android/pylib/findbugs.py
index 996c0eeaaf9afd83343a4f4cde22f8a6ceb5b5a8..05d539a3d952eeec03fcf59bf994b8f7045cb31a 100755
--- a/build/android/pylib/findbugs.py
+++ b/build/android/pylib/findbugs.py
@@ -11,6 +11,7 @@ import shlex
 import subprocess
 import sys
 
+from pylib import constants

[frankf, 2013/01/16 18:10:46]

2 blank lines below this.

[Yaron, 2013/01/16 18:15:28]

Done.

 
 def _PrintMessage(warnings, title, action, known_bugs_file):
   if warnings:
@@ -66,11 +67,10 @@ def _Rebaseline(current_warnings_set, known_bugs_file):
 
 
 def _GetChromeClasses(release_version):
-  chrome_src = os.getenv('CHROME_SRC')
   version = 'Debug'
   if release_version:
     version = 'Release'
-  path = os.path.join(chrome_src, 'out', version)
+  path = os.path.join(constants.CHROME_DIR, 'out', version)
   cmd = 'find %s -name "*.class"' % path
   proc = subprocess.Popen(shlex.split(cmd),
                           stdout=subprocess.PIPE, stderr=subprocess.PIPE)
@@ -99,9 +99,9 @@ def _Run(exclude, known_bugs, classes_to_analyze, auxiliary_classes,
     findbug_args: addtional command line options needs pass to Findbugs.
   """
 
-  chrome_src = os.getenv('CHROME_SRC')
-  sdk_root = os.getenv('ANDROID_SDK_ROOT')
-  sdk_version = os.getenv('ANDROID_SDK_VERSION')
+  chrome_src = constants.CHROME_DIR
+  sdk_root = constants.ANDROID_SDK_ROOT
+  sdk_version = constants.ANDROID_SDK_VERSION
 
   system_classes = []
   system_classes.append(os.path.join(sdk_root, 'platforms',
@@ -222,13 +222,6 @@ def GetCommonParser():
 
   return parser
 
-def CheckEnvironment():
-  if not (os.getenv('CHROME_SRC') and os.getenv('ANDROID_SDK_ROOT') and
-          os.getenv('ANDROID_SDK_VERSION')):
-    print 'Your build environment is not set up correctly.'
-    print 'Please source build/android/envsetup.sh.'
-    return False
-  return True
 
 def main(argv):
   parser = GetCommonParser()
@@ -236,5 +229,6 @@ def main(argv):
 
   return Run(options)
 
+
 if __name__ == '__main__':
   sys.exit(main(sys.argv))