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

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

am a62334ed: Merge "Add "WITH_SYNTAX_CHECK=1 make ..."" 

* commit 'a62334ed':
  Add "WITH_SYNTAX_CHECK=1 make ..."
parents 25f39b2f a62334ed

core/binary.mk

+16 −0
Original line number Diff line number Diff line
@@ -170,6 +170,16 @@ $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_TARGET_GLOBAL_CPPFLAGS := $(TARGET_GLOBAL 
$(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



ifneq ($(strip $(LOCAL_IS_HOST_MODULE)),)

  my_syntax_arch := host

else

  my_syntax_arch := $(TARGET_ARCH)

endif



ifeq ($(strip $(LOCAL_CC)),)

  ifeq ($(strip $(LOCAL_CLANG)),true)

    LOCAL_CC := $(CLANG)
@@ -177,6 +187,9 @@ ifeq ($(strip $(LOCAL_CC)),) 
    LOCAL_CC := $($(my_prefix)CC)

  endif

endif

ifneq ($(LOCAL_NO_SYNTAX_CHECK),true)

  LOCAL_CC := $(SYNTAX_TOOLS_PREFIX)/ccc-syntax $(my_syntax_arch) "$(LOCAL_CC)"

endif

$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_CC := $(LOCAL_CC)



ifeq ($(strip $(LOCAL_CXX)),)
@@ -186,6 +199,9 @@ ifeq ($(strip $(LOCAL_CXX)),) 
    LOCAL_CXX := $($(my_prefix)CXX)

  endif

endif

ifneq ($(LOCAL_NO_SYNTAX_CHECK),true)

  LOCAL_CXX := $(SYNTAX_TOOLS_PREFIX)/cxx-syntax $(my_syntax_arch) "$(LOCAL_CXX)"

endif

$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_CXX := $(LOCAL_CXX)



# TODO: support a mix of standard extensions so that this isn't necessary

core/clear_vars.mk

+1 −0
Original line number Diff line number Diff line
@@ -137,6 +137,7 @@ LOCAL_ADDITIONAL_CERTIFICATES:= 
LOCAL_PREBUILT_MODULE_FILE:=

LOCAL_POST_INSTALL_CMD:=

LOCAL_DIST_BUNDLED_BINARIES:=

LOCAL_NO_SYNTAX_CHECK:=



# Trim MAKEFILE_LIST so that $(call my-dir) doesn't need to

# iterate over thousands of entries every time.

core/config.mk

+9 −0
Original line number Diff line number Diff line
@@ -247,6 +247,15 @@ TARGET_TOOLCHAIN_ROOT := $(patsubst %/, %, $(dir $(TARGET_TOOLCHAIN_ROOT))) 
TARGET_TOOLCHAIN_ROOT := $(wildcard $(TARGET_TOOLCHAIN_ROOT))

endif



# Disable WITH_SYNTAX_CHECK if tool can't be found

SYNTAX_TOOLS_PREFIX := prebuilts/clang/$(HOST_PREBUILT_TAG)/host/3.3/bin

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

  ifeq ($(wildcard $(SYNTAX_TOOLS_PREFIX)/ccc-syntax),)

    $(warning *** Disable WITH_SYNTAX_CHECK because $(SYNTAX_TOOLS_PREFIX)/ccc-syntax does not exist)

    WITH_SYNTAX_CHECK :=

  endif

endif



# Pick a Java compiler.

include $(BUILD_SYSTEM)/combo/javac.mk