Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dc7e26d2 authored by Andrew Hsieh's avatar Andrew Hsieh Committed by Android Git Automerger
Browse files

am 887a76fa: am 1537f8bf: am 12493c89: am 6808c260: Merge "Use analyzer at new... 

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

* commit '887a76fa':
  Use analyzer at new location: prebuilts/misc/{linux-x86,darwin-x86}/analyzer
parents c9b7f3d6 887a76fa

core/config.mk

+1 −1
Original line number Diff line number Diff line
@@ -247,7 +247,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)

envsetup.sh

+2 −2
Original line number Diff line number Diff line
@@ -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