am 12493c89: am 6808c260: Merge "Use analyzer at new location: prebuilts/misc/{linux-x86,darwin-x86}/analyzer"

* commit '12493c892e59d826eec41caea6bc90a5778bb672':
  Use analyzer at new location: prebuilts/misc/{linux-x86,darwin-x86}/analyzer
This commit is contained in:
Andrew Hsieh 2014-03-11 18:28:59 +00:00 committed by Android Git Automerger
commit f25a976fa6
2 changed files with 3 additions and 3 deletions

View File

@ -248,7 +248,7 @@ ifeq ($(strip $(WITH_SYNTAX_CHECK)),0)
endif
# Disable WITH_STATIC_ANALYZER and WITH_SYNTAX_CHECK if tool can't be found
SYNTAX_TOOLS_PREFIX := prebuilts/clang/$(HOST_PREBUILT_TAG)/host/3.3/bin
SYNTAX_TOOLS_PREFIX := prebuilts/misc/$(HOST_PREBUILT_TAG)/analyzer/bin
ifneq ($(strip $(WITH_STATIC_ANALYZER)),)
ifeq ($(wildcard $(SYNTAX_TOOLS_PREFIX)/ccc-analyzer),)
$(warning *** Disable WITH_STATIC_ANALYZER because $(SYNTAX_TOOLS_PREFIX)/ccc-analyzer does not exist)

View File

@ -626,8 +626,8 @@ function getdriver()
test "$WITH_STATIC_ANALYZER" = "0" && unset WITH_STATIC_ANALYZER
if [ -n "$WITH_STATIC_ANALYZER" ]; then
echo "\
$T/prebuilts/clang/linux-x86/host/3.3/tools/scan-build/scan-build \
--use-analyzer $T/prebuilts/clang/linux-x86/host/3.3/bin/analyzer \
$T/prebuilts/misc/linux-x86/analyzer/tools/scan-build/scan-build \
--use-analyzer $T/prebuilts/misc/linux-x86/analyzer/bin/analyzer \
--status-bugs \
--top=$T"
fi