StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove LOCAL_CLANG := false support" into stage-aosp-master

Browse Source
This commit is contained in:
Dan Willemsen
2018-07-24 19:29:39 +00:00
committed by Android (Google) Code Review
parent fdcb3b5829 e303480584
commit fe677e27f0
2 changed files with 4 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/binary.mk
View File

@@ -339,11 +339,10 @@ ifneq ($(my_cc)$(my_cxx),)
my_clang := false my_clang := false
endif endif
endif endif
# Issue warning if LOCAL_CLANG* is set to false and the local makefile is not found
# in the exception project list.
ifeq ($(my_clang),false) ifeq ($(my_clang),false)
ifeq ($(call find_in_local_clang_exception_projects,$(LOCAL_MODULE_MAKEFILE))$(LOCAL_IS_AUX_MODULE),) # https://android-review.googlesource.com/720799
$(error $(LOCAL_MODULE_MAKEFILE): $(LOCAL_MODULE): LOCAL_CLANG is set to false) ifneq ($(LOCAL_MODULE),bionic-compile-time-tests-g++)
$(call pretty-error,LOCAL_CLANG false is no longer supported)
endif endif
endif endif
@@ -351,10 +350,7 @@ endif
# enable it unless we've specifically disabled clang above # enable it unless we've specifically disabled clang above
ifdef LOCAL_IS_HOST_MODULE ifdef LOCAL_IS_HOST_MODULE
ifneq ($($(my_prefix)CLANG_SUPPORTED),true) ifneq ($($(my_prefix)CLANG_SUPPORTED),true)
ifeq ($(my_clang),true) $(error $($(my_prefix)OS) requires GCC$(comma) but only Clang is supported)
$(call pretty-error,Clang is not yet supported for $($(my_prefix)OS) binaries)
endif
my_clang := false
else else
ifeq ($(my_clang),) ifeq ($(my_clang),)
my_clang := true my_clang := true

24
core/clang/config.mk
View File

@@ -68,28 +68,4 @@ endif
# provides to Clang (for supporting features like -ftrapv). # provides to Clang (for supporting features like -ftrapv).
COMPILER_RT_CONFIG_EXTRA_STATIC_LIBRARIES := libcompiler_rt-extras COMPILER_RT_CONFIG_EXTRA_STATIC_LIBRARIES := libcompiler_rt-extras
# A list of projects that are allowed to set LOCAL_CLANG to false.
# INTERNAL_LOCAL_CLANG_EXCEPTION_PROJECTS is defined later in other config.mk.
LOCAL_CLANG_EXCEPTION_PROJECTS = \
bionic/tests/ \
device/google/contexthub/ \
device/huawei/angler/ \
device/lge/bullhead/ \
external/gentoo/integration/ \
hardware/qcom/ \
test/vts/hals/camera/bullhead/ \
test/vts/hals/etc/libqdutils/ \
vendor/huawei/angler/ \
vendor/lge/bullhead/ \
$(INTERNAL_LOCAL_CLANG_EXCEPTION_PROJECTS)
# Find $1 in the exception project list.
define find_in_local_clang_exception_projects
$(subst $(space),, \
$(foreach project,$(LOCAL_CLANG_EXCEPTION_PROJECTS), \
$(if $(filter $(project)%,$(1)),$(project)) \
) \
)
endef
include $(BUILD_SYSTEM)/clang/tidy.mk include $(BUILD_SYSTEM)/clang/tidy.mk