Merge "Remove GCC support from Make" (5a3ddef8) · Commits · e / os / android_build

core/binary.mk

+36 −125

Original line number	Diff line number	Diff line
		@@ -332,33 +332,9 @@ endif
		ifdef LOCAL_CLANG_$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)
		my_clang := $(strip $(LOCAL_CLANG_$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)))
		endif

		# if custom toolchain is in use, default is not to use clang, if not explicitly required
		ifneq ($(my_cc)$(my_cxx),)
		ifeq ($(my_clang),)
		my_clang := false
		endif
		endif
		ifeq ($(my_clang),false)
		# https://android-review.googlesource.com/720799
		ifneq ($(LOCAL_MODULE),bionic-compile-time-tests-g++)
		$(call pretty-error,LOCAL_CLANG false is no longer supported)
		endif
		endif

		# clang is enabled by default for host builds
		# enable it unless we've specifically disabled clang above
		ifdef LOCAL_IS_HOST_MODULE
		ifneq ($($(my_prefix)CLANG_SUPPORTED),true)
		$(error $($(my_prefix)OS) requires GCC$(comma) but only Clang is supported)
		else
		ifeq ($(my_clang),)
		my_clang := true
		endif
		endif
		else ifeq ($(my_clang),)
		my_clang := true
		endif

		ifeq ($(LOCAL_C_STD),)
		my_c_std_version := $(DEFAULT_C_STD_VERSION)
		@@ -376,21 +352,6 @@ else
		my_cpp_std_version := $(LOCAL_CPP_STD)
		endif

		ifneq ($(my_clang),true)
		# GCC uses an invalid C++14 ABI (emits calls to
		# __cxa_throw_bad_array_length, which is not a valid C++ RT ABI).
		# http://b/25022512
		my_cpp_std_version := $(DEFAULT_GCC_CPP_STD_VERSION)
		endif

		ifdef LOCAL_IS_HOST_MODULE
		ifneq ($(my_clang),true)
		# The host GCC doesn't support C++14 (and is deprecated, so likely
		# never will). Build these modules with C++11.
		my_cpp_std_version := $(DEFAULT_GCC_CPP_STD_VERSION)
		endif
		endif

		my_c_std_conlyflags :=
		my_cpp_std_cppflags :=
		ifneq (,$(my_c_std_version))
		@@ -402,11 +363,9 @@ ifneq (,$(my_cpp_std_version))
		endif

		# Extra cflags for projects under external/ directory
		ifeq ($(my_clang),true)
		ifneq ($(filter external/%,$(LOCAL_PATH)),)
		my_cflags += $(CLANG_EXTERNAL_CFLAGS)
		endif
		endif

		# arch-specific static libraries go first so that generic ones can depend on them
		my_static_libraries := $(LOCAL_STATIC_LIBRARIES_$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) $(LOCAL_STATIC_LIBRARIES_$(my_32_64_bit_suffix)) $(my_static_libraries)
		@@ -516,7 +475,6 @@ my_target_global_c_system_includes := $(SRC_SYSTEM_HEADERS) $(TARGET_OUT_HEADERS
		$($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)C_SYSTEM_INCLUDES)
		endif

		ifeq ($(my_clang),true)
		my_target_global_cflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)CLANG_$(my_prefix)GLOBAL_CFLAGS)
		my_target_global_conlyflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)CLANG_$(my_prefix)GLOBAL_CONLYFLAGS) $(my_c_std_conlyflags)
		my_target_global_cppflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)CLANG_$(my_prefix)GLOBAL_CPPFLAGS) $(my_cpp_std_cppflags)
		@@ -529,12 +487,6 @@ ifeq ($(my_use_clang_lld),true)
		else
		my_target_global_ldflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)CLANG_$(my_prefix)GLOBAL_LDFLAGS)
		endif # my_use_clang_lld
		else
		my_target_global_cflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)GLOBAL_CFLAGS)
		my_target_global_conlyflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)GLOBAL_CONLYFLAGS) $(my_c_std_conlyflags)
		my_target_global_cppflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)GLOBAL_CPPFLAGS) $(my_cpp_std_cppflags)
		my_target_global_ldflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)GLOBAL_LDFLAGS)
		endif # my_clang

		$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_GLOBAL_C_INCLUDES := $(my_target_global_c_includes)
		$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_GLOBAL_C_SYSTEM_INCLUDES := $(my_target_global_c_system_includes)
		@@ -550,7 +502,6 @@ my_host_global_c_includes := $(SRC_HEADERS) \
		my_host_global_c_system_includes := $(SRC_SYSTEM_HEADERS) \
		$($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)C_SYSTEM_INCLUDES)

		ifeq ($(my_clang),true)
		my_host_global_cflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)CLANG_$(my_prefix)GLOBAL_CFLAGS)
		my_host_global_conlyflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)CLANG_$(my_prefix)GLOBAL_CONLYFLAGS) $(my_c_std_conlyflags)
		my_host_global_cppflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)CLANG_$(my_prefix)GLOBAL_CPPFLAGS) $(my_cpp_std_cppflags)
		@@ -559,12 +510,6 @@ ifeq ($(my_use_clang_lld),true)
		else
		my_host_global_ldflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)CLANG_$(my_prefix)GLOBAL_LDFLAGS)
		endif # my_use_clang_lld
		else
		my_host_global_cflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)GLOBAL_CFLAGS)
		my_host_global_conlyflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)GLOBAL_CONLYFLAGS) $(my_c_std_conlyflags)
		my_host_global_cppflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)GLOBAL_CPPFLAGS) $(my_cpp_std_cppflags)
		my_host_global_ldflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)GLOBAL_LDFLAGS)
		endif # my_clang

		$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_GLOBAL_C_INCLUDES := $(my_host_global_c_includes)
		$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_GLOBAL_C_SYSTEM_INCLUDES := $(my_host_global_c_system_includes)
		@@ -590,11 +535,7 @@ ifeq ($(NATIVE_COVERAGE),true)
		my_ldflags += --coverage
		endif

		ifeq ($(my_clang),true)
		my_coverage_lib := $($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)LIBPROFILE_RT)
		else
		my_coverage_lib := $(call intermediates-dir-for,STATIC_LIBRARIES,libgcov,$(filter AUX,$(my_kind)),,$(LOCAL_2ND_ARCH_VAR_PREFIX))/libgcov.a
		endif

		$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_TARGET_COVERAGE_LIB := $(my_coverage_lib)
		$(LOCAL_INTERMEDIATE_TARGETS): $(my_coverage_lib)
		@@ -612,12 +553,6 @@ ifeq ($(strip $(WITH_STATIC_ANALYZER)),)
		LOCAL_NO_STATIC_ANALYZER := true
		endif

		# Clang does not recognize all gcc flags.
		# Use static analyzer only if clang is used.
		ifneq ($(my_clang),true)
		LOCAL_NO_STATIC_ANALYZER := true
		endif

		ifneq ($(strip $(LOCAL_IS_HOST_MODULE)),)
		my_syntax_arch := host
		else
		@@ -625,12 +560,7 @@ else
		endif

		ifeq ($(strip $(my_cc)),)
		ifeq ($(my_clang),true)
		my_cc := $(CLANG)
		else
		my_cc := $($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)CC)
		endif
		my_cc := $(my_cc_wrapper) $(my_cc)
		my_cc := $(my_cc_wrapper) $(CLANG)
		endif

		SYNTAX_TOOLS_PREFIX := \
		@@ -644,12 +574,7 @@ endif
		$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_CC := $(my_cc)

		ifeq ($(strip $(my_cxx)),)
		ifeq ($(my_clang),true)
		my_cxx := $(CLANG_CXX)
		else
		my_cxx := $($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)CXX)
		endif
		my_cxx := $(my_cxx_wrapper) $(my_cxx)
		my_cxx := $(my_cxx_wrapper) $(CLANG_CXX)
		endif

		ifneq ($(LOCAL_NO_STATIC_ANALYZER),true)
		@@ -659,7 +584,6 @@ endif

		$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_LINKER := $(my_linker)
		$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_CXX := $(my_cxx)
		$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_CLANG := $(my_clang)

		# TODO: support a mix of standard extensions so that this isn't necessary
		LOCAL_CPP_EXTENSION := $(strip $(LOCAL_CPP_EXTENSION))
		@@ -703,10 +627,8 @@ normal_objects_mode := $(if $(LOCAL_ARM_MODE),$(LOCAL_ARM_MODE),thumb)
		# actually used (although they are usually empty).
		arm_objects_cflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)$(arm_objects_mode)_CFLAGS)
		normal_objects_cflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)$(normal_objects_mode)_CFLAGS)
		ifeq ($(my_clang),true)
		arm_objects_cflags := $(call convert-to-clang-flags,$(arm_objects_cflags))
		normal_objects_cflags := $(call convert-to-clang-flags,$(normal_objects_cflags))
		endif

		else
		arm_objects_mode :=
		@@ -1643,7 +1565,6 @@ endif
		# Rule-specific variable definitions
		###########################################################

		ifeq ($(my_clang),true)
		my_cflags += $(LOCAL_CLANG_CFLAGS)
		my_conlyflags += $(LOCAL_CLANG_CONLYFLAGS)
		my_cppflags += $(LOCAL_CLANG_CPPFLAGS)
		@@ -1660,11 +1581,6 @@ my_cflags := $(call convert-to-clang-flags,$(my_cflags))
		my_cppflags := $(call convert-to-clang-flags,$(my_cppflags))
		my_asflags := $(call convert-to-clang-flags,$(my_asflags))
		my_ldflags := $(call convert-to-clang-flags,$(my_ldflags))
		else
		# gcc does not handle hidden functions in a manner compatible with LLVM libcxx
		# see b/27908145
		my_cflags += -Wno-attributes
		endif

		ifeq ($(my_fdo_build), true)
		my_cflags := $(patsubst -Os,-O2,$(my_cflags))
		@@ -1738,10 +1654,6 @@ endif
		my_tidy_checks :=
		my_tidy_flags :=
		ifneq (,$(filter 1 true,$(my_tidy_enabled)))
		ifneq ($(my_clang),true)
		# Disable clang-tidy if clang is disabled.
		my_tidy_enabled := false
		else
		tidy_only: $(cpp_objects) $(c_objects) $(gen_c_objects) $(gen_cpp_objects)
		# Set up global default checks
		my_tidy_checks := $(WITH_TIDY_CHECKS)
		@@ -1777,7 +1689,6 @@ ifneq (,$(filter 1 true,$(my_tidy_enabled)))
		my_tidy_flags += -extra-arg-before=c++-temp-dtor-inlining=false
		endif
		endif
		endif

		my_tidy_checks := $(subst $(space),,$(my_tidy_checks))

core/config.mk

+27 −0

Original line number	Diff line number	Diff line
		@@ -85,6 +85,33 @@ $(KATI_obsolete_var \
		$(KATI_obsolete_var PRODUCT_COMPATIBILITY_MATRIX_LEVEL_OVERRIDE,Set FCM Version in device manifest instead. See $(CHANGES_URL)#PRODUCT_COMPATIBILITY_MATRIX_LEVEL_OVERRIDE)
		$(KATI_obsolete_var USE_CLANG_PLATFORM_BUILD,Clang is the only supported Android compiler. See $(CHANGES_URL)#USE_CLANG_PLATFORM_BUILD)
		$(KATI_obsolete_var BUILD_DROIDDOC,Droiddoc is only supported in Soong. See details on build/soong/java/droiddoc.go)
		$(KATI_obsolete_var \
		DEFAULT_GCC_CPP_STD_VERSION \
		HOST_GLOBAL_CFLAGS 2ND_HOST_GLOBAL_CFLAGS \
		HOST_GLOBAL_CONLYFLAGS 2ND_HOST_GLOBAL_CONLYFLAGS \
		HOST_GLOBAL_CPPFLAGS 2ND_HOST_GLOBAL_CPPFLAGS \
		HOST_GLOBAL_LDFLAGS 2ND_HOST_GLOBAL_LDFLAGS \
		HOST_GLOBAL_LLDFLAGS 2ND_HOST_GLOBAL_LLDFLAGS \
		HOST_CLANG_SUPPORTED 2ND_HOST_CLANG_SUPPORTED \
		HOST_CC 2ND_HOST_CC \
		HOST_CXX 2ND_HOST_CXX \
		HOST_CROSS_GLOBAL_CFLAGS 2ND_HOST_CROSS_GLOBAL_CFLAGS \
		HOST_CROSS_GLOBAL_CONLYFLAGS 2ND_HOST_CROSS_GLOBAL_CONLYFLAGS \
		HOST_CROSS_GLOBAL_CPPFLAGS 2ND_HOST_CROSS_GLOBAL_CPPFLAGS \
		HOST_CROSS_GLOBAL_LDFLAGS 2ND_HOST_CROSS_GLOBAL_LDFLAGS \
		HOST_CROSS_GLOBAL_LLDFLAGS 2ND_HOST_CROSS_GLOBAL_LLDFLAGS \
		HOST_CROSS_CLANG_SUPPORTED 2ND_HOST_CROSS_CLANG_SUPPORTED \
		HOST_CROSS_CC 2ND_HOST_CROSS_CC \
		HOST_CROSS_CXX 2ND_HOST_CROSS_CXX \
		TARGET_GLOBAL_CFLAGS 2ND_TARGET_GLOBAL_CFLAGS \
		TARGET_GLOBAL_CONLYFLAGS 2ND_TARGET_GLOBAL_CONLYFLAGS \
		TARGET_GLOBAL_CPPFLAGS 2ND_TARGET_GLOBAL_CPPFLAGS \
		TARGET_GLOBAL_LDFLAGS 2ND_TARGET_GLOBAL_LDFLAGS \
		TARGET_GLOBAL_LLDFLAGS 2ND_TARGET_GLOBAL_LLDFLAGS \
		TARGET_CLANG_SUPPORTED 2ND_TARGET_CLANG_SUPPORTED \
		TARGET_CC 2ND_TARGET_CC \
		TARGET_CXX 2ND_TARGET_CXX \
		,GCC support has been removed. Use Clang instead)

		# This is marked as obsolete in envsetup.mk after reading the BoardConfig.mk
		$(KATI_deprecate_export It is a global setting. See $(CHANGES_URL)#export_keyword)

core/config_sanitizers.mk

+8 −20

Original line number	Diff line number	Diff line
		@@ -5,12 +5,8 @@
		my_sanitize := $(strip $(LOCAL_SANITIZE))
		my_sanitize_diag := $(strip $(LOCAL_SANITIZE_DIAG))

		# SANITIZE_HOST is only in effect if the module is already using clang (host
		# modules that haven't set `LOCAL_CLANG := false` and device modules that
		# have set `LOCAL_CLANG := true`.
		my_global_sanitize :=
		my_global_sanitize_diag :=
		ifeq ($(my_clang),true)
		ifdef LOCAL_IS_HOST_MODULE
		ifneq ($($(my_prefix)OS),windows)
		my_global_sanitize := $(strip $(SANITIZE_HOST))
		@@ -22,7 +18,6 @@ ifeq ($(my_clang),true)
		my_global_sanitize := $(strip $(SANITIZE_TARGET))
		my_global_sanitize_diag := $(strip $(SANITIZE_TARGET_DIAG))
		endif
		endif

		# Disable global integer_overflow in excluded paths.
		ifneq ($(filter integer_overflow, $(my_global_sanitize)),)
		@@ -235,13 +230,6 @@ ifneq ($(filter address thread,$(strip $(SANITIZE_TARGET))),)
		endif
		endif

		# Sanitizers can only be used with clang.
		ifneq ($(my_clang),true)
		ifneq ($(my_sanitize),)
		$(error $(LOCAL_PATH): $(LOCAL_MODULE): Use of sanitizers requires LOCAL_CLANG := true)
		endif
		endif

		ifneq ($(filter default-ub,$(my_sanitize)),)
		my_sanitize := $(CLANG_DEFAULT_UB_CHECKS)
		endif

core/definitions.mk

+2 −2

Original line number	Diff line number	Diff line
		@@ -1064,7 +1064,7 @@ $(hide) $(PRIVATE_CXX) -shared -Wl,-soname,$(notdir $@) -nostdlib \
		-Wl,-rpath,\$$ORIGIN/../lib \
		$(dir $@)/$(notdir $(<:.bc=.o)) \
		$(RS_PREBUILT_COMPILER_RT) \
		-o $@ $(TARGET_GLOBAL_LDFLAGS) -Wl,--hash-style=sysv \
		-o $@ $(CLANG_TARGET_GLOBAL_LDFLAGS) -Wl,--hash-style=sysv \
		-L $(SOONG_OUT_DIR)/ndk/platforms/android-$(PRIVATE_SDK_VERSION)/arch-$(TARGET_ARCH)/usr/lib64 \
		-L $(SOONG_OUT_DIR)/ndk/platforms/android-$(PRIVATE_SDK_VERSION)/arch-$(TARGET_ARCH)/usr/lib \
		$(call intermediates-dir-for,SHARED_LIBRARIES,libRSSupport)/libRSSupport.so \
		@@ -1808,7 +1808,7 @@ define transform-o-to-shared-lib-inner
		$(hide) $(PRIVATE_CXX) \
		-nostdlib -Wl,-soname,$(notdir $@) \
		-Wl,--gc-sections \
		$(if $(filter true,$(PRIVATE_CLANG)),-shared,-Wl$(comma)-shared) \
		-shared \
		$(PRIVATE_TARGET_CRTBEGIN_SO_O) \
		$(PRIVATE_ALL_OBJECTS) \
		-Wl,--whole-archive \

core/java_renderscript.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -138,7 +138,7 @@ endif
		$(rs_compatibility_jni_libs): $(RS_PREBUILT_CLCORE) \
		$(rs_support_lib) $(rs_support_io_lib) $(rs_jni_lib) $(rs_compiler_rt)
		$(rs_compatibility_jni_libs): $(BCC_COMPAT)
		$(rs_compatibility_jni_libs): PRIVATE_CXX := $(CXX_WRAPPER) $(TARGET_CXX)
		$(rs_compatibility_jni_libs): PRIVATE_CXX := $(CXX_WRAPPER) $(CLANG_CXX)
		$(rs_compatibility_jni_libs): PRIVATE_SDK_VERSION := $(my_min_sdk_version)
		$(rs_compatibility_jni_libs): $(renderscript_intermediate)/librs.%.so: \
		$(renderscript_intermediate.bc_folder)%.bc \