Remove WITH_SYNTAX_CHECK
It's no longer used. The majority of the platform is on clang anyways.
Test: m -j
Change-Id: I4fb4375eaad2469e169d34c47ae3fe2a0540aeec
diff --git a/core/binary.mk b/core/binary.mk
index e11ab89..b440091 100644
--- a/core/binary.mk
+++ b/core/binary.mk
@@ -561,10 +561,6 @@
$(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 @@
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 @@
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)
diff --git a/core/clear_vars.mk b/core/clear_vars.mk
index 4f0c839..dfa497e 100644
--- a/core/clear_vars.mk
+++ b/core/clear_vars.mk
@@ -172,7 +172,6 @@
LOCAL_POST_INSTALL_CMD:=
LOCAL_HAL_STATIC_LIBRARIES:=
LOCAL_RMTYPEDEFS:=
-LOCAL_NO_SYNTAX_CHECK:=
LOCAL_NO_STATIC_ANALYZER:=
LOCAL_TIDY:=
LOCAL_TIDY_CHECKS:=
diff --git a/core/config.mk b/core/config.mk
index 525b639..b084254 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -333,13 +333,10 @@
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 @@
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 @@
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