[Android] Sever findbugs dependencies on environment variables.

build/android/pylib/findbugs.py

 #!/usr/bin/env python
 #
 # 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.
 
 import optparse
 import os
 import re
 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:
     print
     print '*' * 80
     print '%s warnings.' % title
     print '%s %s' % (action, known_bugs_file)
     print '-' * 80
     for warning in warnings:
       print warning
@@ skipping 35 matching lines @@
 
 
 def _Rebaseline(current_warnings_set, known_bugs_file):
   with file(known_bugs_file, 'w') as known_bugs:
     for warning in sorted(current_warnings_set):
       print >>known_bugs, warning
   return 0
 
 
 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)
   out, err = proc.communicate()
 
   if not out:
     print 'No classes found in %s' % path
   return out
 
 
 def _Run(exclude, known_bugs, classes_to_analyze, auxiliary_classes,
         rebaseline, release_version, findbug_args):
   """Run the FindBugs.
 
   Args:
     exclude: the exclude xml file, refer to FindBugs's -exclude command option.
     known_bugs: the text file of known bugs. The bugs in it will not be
                 reported.
     classes_to_analyze: the list of classes need to analyze, refer to FindBug's
                         -onlyAnalyze command line option.
     auxiliary_classes: the classes help to analyze, refer to FindBug's
                        -auxclasspath command line option.
     rebaseline: True if the known_bugs file needs rebaseline.
     release_version: True if the release version needs check, otherwise check
                      debug version.
     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',
                                      'android-%s' % sdk_version, 'android.jar'))
   if auxiliary_classes:
     for classes in auxiliary_classes:
       system_classes.append(os.path.abspath(classes))
 
   cmd = '%s -textui -sortByClass ' % os.path.join(chrome_src, 'third_party',
                                                   'findbugs', 'bin', 'findbugs')
@@ skipping 100 matching lines @@
 
   parser.add_option('-b',
                     '--base-dir',
                     action='store',
                     default=None,
                     dest='base_dir',
                     help='Base directory for configuration file.')
 
   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()
   options, _ = parser.parse_args()
 
   return Run(options)
 
+
 if __name__ == '__main__':
   sys.exit(main(sys.argv))