openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge "Remove WITH_SYNTAX_CHECK" am: c114bd9dbf 

am: d640e062e8

Change-Id: Ia808c46ce1089210eaa5db02b446cfca0ed5cdde
This commit is contained in:
Dan Willemsen 2016-09-28 01:55:17 +00:00 committed by android-build-merger
parent 3791e7b242 d640e062e8
commit 28d50c498b
3 changed files with 2 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/binary.mk
View File

@ -561,10 +561,6 @@ endif
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_NO_DEFAULT_COMPILER_FLAGS := \ $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_NO_DEFAULT_COMPILER_FLAGS := \
$(strip $(LOCAL_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)),) ifeq ($(strip $(WITH_STATIC_ANALYZER)),)
LOCAL_NO_STATIC_ANALYZER := true LOCAL_NO_STATIC_ANALYZER := true
endif endif
@ -593,10 +589,6 @@ endif
ifneq ($(LOCAL_NO_STATIC_ANALYZER),true) ifneq ($(LOCAL_NO_STATIC_ANALYZER),true)
my_cc := CCC_CC=$(CLANG) CLANG=$(CLANG) \ my_cc := CCC_CC=$(CLANG) CLANG=$(CLANG) \
$(SYNTAX_TOOLS_PREFIX)/ccc-analyzer $(SYNTAX_TOOLS_PREFIX)/ccc-analyzer
else
ifneq ($(LOCAL_NO_SYNTAX_CHECK),true)
my_cc := $(my_cc) -fsyntax-only
endif
endif endif
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_CC := $(my_cc) $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_CC := $(my_cc)
@ -613,10 +605,6 @@ endif
ifneq ($(LOCAL_NO_STATIC_ANALYZER),true) ifneq ($(LOCAL_NO_STATIC_ANALYZER),true)
my_cxx := CCC_CXX=$(CLANG_CXX) CLANG_CXX=$(CLANG_CXX) \ my_cxx := CCC_CXX=$(CLANG_CXX) CLANG_CXX=$(CLANG_CXX) \
$(SYNTAX_TOOLS_PREFIX)/c++-analyzer $(SYNTAX_TOOLS_PREFIX)/c++-analyzer
else
ifneq ($(LOCAL_NO_SYNTAX_CHECK),true)
my_cxx := $(my_cxx) -fsyntax-only
endif
endif endif
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_LINKER := $(my_linker) $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_LINKER := $(my_linker)

1
core/clear_vars.mk
View File

@ -172,7 +172,6 @@ LOCAL_POST_LINK_CMD:=
LOCAL_POST_INSTALL_CMD:= LOCAL_POST_INSTALL_CMD:=
LOCAL_HAL_STATIC_LIBRARIES:= LOCAL_HAL_STATIC_LIBRARIES:=
LOCAL_RMTYPEDEFS:= LOCAL_RMTYPEDEFS:=
LOCAL_NO_SYNTAX_CHECK:=
LOCAL_NO_STATIC_ANALYZER:= LOCAL_NO_STATIC_ANALYZER:=
LOCAL_TIDY:= LOCAL_TIDY:=
LOCAL_TIDY_CHECKS:= LOCAL_TIDY_CHECKS:=

15
core/config.mk
View File

@ -333,13 +333,10 @@ ifdef TARGET_2ND_ARCH
2ND_TARGET_GCC_VERSION := 4.9 2ND_TARGET_GCC_VERSION := 4.9
endif endif
# Normalize WITH_STATIC_ANALYZER and WITH_SYNTAX_CHECK # Normalize WITH_STATIC_ANALYZER
ifeq ($(strip $(WITH_STATIC_ANALYZER)),0) ifeq ($(strip $(WITH_STATIC_ANALYZER)),0)
WITH_STATIC_ANALYZER := WITH_STATIC_ANALYZER :=
endif endif
ifeq ($(strip $(WITH_SYNTAX_CHECK)),0)
WITH_SYNTAX_CHECK :=
endif
# define clang/llvm versions and base directory. # define clang/llvm versions and base directory.
include $(BUILD_SYSTEM)/clang/versions.mk include $(BUILD_SYSTEM)/clang/versions.mk
@ -358,7 +355,7 @@ ifeq ($(wildcard $(PATH_TO_CLANG_TIDY)),)
PATH_TO_CLANG_TIDY := PATH_TO_CLANG_TIDY :=
endif 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 := \ SYNTAX_TOOLS_PREFIX := \
$(LLVM_PREBUILTS_BASE)/$(BUILD_OS)-x86/$(LLVM_PREBUILTS_VERSION)/tools/scan-build/libexec $(LLVM_PREBUILTS_BASE)/$(BUILD_OS)-x86/$(LLVM_PREBUILTS_VERSION)/tools/scan-build/libexec
ifneq ($(strip $(WITH_STATIC_ANALYZER)),) ifneq ($(strip $(WITH_STATIC_ANALYZER)),)
@ -368,14 +365,6 @@ ifneq ($(strip $(WITH_STATIC_ANALYZER)),)
endif endif
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. # Pick a Java compiler.
include $(BUILD_SYSTEM)/combo/javac.mk include $(BUILD_SYSTEM)/combo/javac.mk