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

Commit c114bd9d authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Remove WITH_SYNTAX_CHECK"

parents 9796175d e68100e8

core/binary.mk

+0 −12
Original line number Diff line number Diff line
@@ -561,10 +561,6 @@ endif 
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_NO_DEFAULT_COMPILER_FLAGS := \

    $(strip $(LOCAL_NO_DEFAULT_COMPILER_FLAGS))



ifeq ($(strip $(WITH_SYNTAX_CHECK)),)

  LOCAL_NO_SYNTAX_CHECK := true

endif



ifeq ($(strip $(WITH_STATIC_ANALYZER)),)

  LOCAL_NO_STATIC_ANALYZER := true

endif
@@ -593,10 +589,6 @@ endif 
ifneq ($(LOCAL_NO_STATIC_ANALYZER),true)

  my_cc := CCC_CC=$(CLANG) CLANG=$(CLANG) \

           $(SYNTAX_TOOLS_PREFIX)/ccc-analyzer

else

ifneq ($(LOCAL_NO_SYNTAX_CHECK),true)

  my_cc := $(my_cc) -fsyntax-only

endif

endif



$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_CC := $(my_cc)
@@ -613,10 +605,6 @@ endif 
ifneq ($(LOCAL_NO_STATIC_ANALYZER),true)

  my_cxx := CCC_CXX=$(CLANG_CXX) CLANG_CXX=$(CLANG_CXX) \

            $(SYNTAX_TOOLS_PREFIX)/c++-analyzer

else

ifneq ($(LOCAL_NO_SYNTAX_CHECK),true)

  my_cxx := $(my_cxx) -fsyntax-only

endif

endif



$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_LINKER := $(my_linker)

core/clear_vars.mk

+0 −1
Original line number Diff line number Diff line
@@ -172,7 +172,6 @@ LOCAL_POST_LINK_CMD:= 
LOCAL_POST_INSTALL_CMD:=

LOCAL_HAL_STATIC_LIBRARIES:=

LOCAL_RMTYPEDEFS:=

LOCAL_NO_SYNTAX_CHECK:=

LOCAL_NO_STATIC_ANALYZER:=

LOCAL_TIDY:=

LOCAL_TIDY_CHECKS:=

core/config.mk

+2 −13
Original line number Diff line number Diff line
@@ -333,13 +333,10 @@ ifdef TARGET_2ND_ARCH 
2ND_TARGET_GCC_VERSION := 4.9

endif



# Normalize WITH_STATIC_ANALYZER and WITH_SYNTAX_CHECK

# Normalize WITH_STATIC_ANALYZER

ifeq ($(strip $(WITH_STATIC_ANALYZER)),0)

  WITH_STATIC_ANALYZER :=

endif

ifeq ($(strip $(WITH_SYNTAX_CHECK)),0)

  WITH_SYNTAX_CHECK :=

endif



# define clang/llvm versions and base directory.

include $(BUILD_SYSTEM)/clang/versions.mk
@@ -358,7 +355,7 @@ ifeq ($(wildcard $(PATH_TO_CLANG_TIDY)),) 
  PATH_TO_CLANG_TIDY :=

endif



# Disable WITH_STATIC_ANALYZER and WITH_SYNTAX_CHECK if tool can't be found

# Disable WITH_STATIC_ANALYZER if tool can't be found

SYNTAX_TOOLS_PREFIX := \

    $(LLVM_PREBUILTS_BASE)/$(BUILD_OS)-x86/$(LLVM_PREBUILTS_VERSION)/tools/scan-build/libexec

ifneq ($(strip $(WITH_STATIC_ANALYZER)),)
@@ -368,14 +365,6 @@ ifneq ($(strip $(WITH_STATIC_ANALYZER)),) 
  endif

endif



# WITH_STATIC_ANALYZER trumps WITH_SYNTAX_CHECK

ifneq ($(strip $(WITH_STATIC_ANALYZER)),)

  ifneq ($(strip $(WITH_SYNTAX_CHECK)),)

    $(warning *** Disable WITH_SYNTAX_CHECK in the presence of static analyzer WITH_STATIC_ANALYZER)

    WITH_SYNTAX_CHECK :=

  endif

endif



# Pick a Java compiler.

include $(BUILD_SYSTEM)/combo/javac.mk