diff options
Diffstat (limited to 'build/android/pylib/utils/findbugs.py')
| -rw-r--r-- | build/android/pylib/utils/findbugs.py | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/build/android/pylib/utils/findbugs.py b/build/android/pylib/utils/findbugs.py index fb67268..7275322 100644 --- a/build/android/pylib/utils/findbugs.py +++ b/build/android/pylib/utils/findbugs.py @@ -66,11 +66,8 @@ def _Rebaseline(current_warnings_set, known_bugs_file): return 0 -def _GetChromeClasses(release_version): - version = 'Debug' - if release_version: - version = 'Release' - path = os.path.join(constants.DIR_SOURCE_ROOT, 'out', version) +def _GetChromeClasses(): + path = constants.GetOutDirectory() cmd = 'find %s -name "*.class"' % path out = cmd_helper.GetCmdOutput(shlex.split(cmd)) if not out: @@ -79,7 +76,7 @@ def _GetChromeClasses(release_version): def _Run(exclude, known_bugs, classes_to_analyze, auxiliary_classes, - rebaseline, release_version, findbug_args): + rebaseline, findbug_args): """Run the FindBugs. Args: @@ -91,8 +88,6 @@ def _Run(exclude, known_bugs, classes_to_analyze, auxiliary_classes, 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. """ @@ -135,7 +130,7 @@ def _Run(exclude, known_bugs, classes_to_analyze, auxiliary_classes, if findbug_args: cmd = '%s %s ' % (cmd, findbug_args) - chrome_classes = _GetChromeClasses(release_version) + chrome_classes = _GetChromeClasses() if not chrome_classes: return 1 cmd = '%s %s ' % (cmd, chrome_classes) @@ -168,7 +163,7 @@ def Run(options): if options.auxclasspath: auxclasspath = options.auxclasspath.split(':') return _Run(exclude_file, known_bugs_file, options.only_analyze, auxclasspath, - options.rebaseline, options.release_build, options.findbug_args) + options.rebaseline, options.findbug_args) def GetCommonParser(): @@ -207,12 +202,6 @@ def GetCommonParser(): dest='known_bugs', help='Not report the bugs in the given file.') - parser.add_option('-l', - '--release-build', - action='store_true', - dest='release_build', - help='Analyze release build instead of debug.') - parser.add_option('-f', '--findbug-args', action='store', |