commit 6808c2608f0eff3275110154d7267f934700c167
author Andrew Hsieh <andrewhsieh@google.com> Tue Mar 04 01:06:04 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Mar 04 01:06:04 2014 +0000
tree 8bef8e777b0dfe2b720dab42a0ec4b5fa1e8d440
parent 38626e635771a9e1d5ee8f812ea967d842938052
parent c4f7fbae020ef662de1ec6d037f9bb2b16b46d46

Merge "Use analyzer at new location: prebuilts/misc/{linux-x86,darwin-x86}/analyzer"

core/config.mk

diff --git a/core/config.mk b/core/config.mk
index 5621778..141fc78 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -248,7 +248,7 @@
 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)

envsetup.sh

diff --git a/envsetup.sh b/envsetup.sh
index bda1c45..d3bfe80 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -626,8 +626,8 @@
     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