Merge "Add option for generating coverage info." (33029248) · Commits · e / os / android_build

core/binary.mk

+26 −0

Original line number	Diff line number	Diff line
		@@ -113,6 +113,7 @@ my_cc := $(LOCAL_CC)
		my_cxx := $(LOCAL_CXX)
		my_c_includes := $(LOCAL_C_INCLUDES)
		my_generated_sources := $(LOCAL_GENERATED_SOURCES)
		my_native_coverage := $(LOCAL_NATIVE_COVERAGE)

		# MinGW spits out warnings about -fPIC even for -fpie?!) being ignored because
		# all code is position independent, and then those warnings get promoted to
		@@ -321,6 +322,31 @@ my_target_global_cppflags += $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_GLOBAL_CPPFLAG
		my_target_global_ldflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_GLOBAL_LDFLAGS)
		endif # my_clang

		# If the global flag NATIVE_COVERAGE is set, my_native_coverage will be true
		# unless the module explicitly sets my_native_coverage := false.
		ifeq ($(NATIVE_COVERAGE),true)
		ifeq ($(my_native_coverage),true)
		# We can't currently generate coverage for clang binaries for two
		# reasons:
		#
		# 1) b/17574078 We currently don't have a prebuilt
		# libclang_rt.profile-<ARCH>.a, which clang is hardcoded to link if
		# --coverage is passed in the link stage. For now we manually link
		# libprofile_rt (which is the name it is built as from
		# external/compiler-rt).
		#
		# 2) b/17583330 Clang doesn't generate .gcno files when using
		# -no-integrated-as. Since most of the assembly in our tree is
		# incompatible with clang's assembler, we can't turn off this flag.
		ifneq ($(my_clang),true)
		my_target_global_cflags += --coverage
		my_target_global_ldflags += --coverage
		endif
		endif
		else
		my_native_coverage := false
		endif

		$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_TARGET_PROJECT_INCLUDES := $(my_target_project_includes)
		$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_TARGET_C_INCLUDES := $(my_target_c_includes)
		$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_TARGET_GLOBAL_CFLAGS := $(my_target_global_cflags)

core/clear_vars.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -158,6 +158,7 @@ LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH_WARN:=
		LOCAL_MODULE_HOST_ARCH:=
		LOCAL_NO_FPIE :=
		LOCAL_CXX_STL := default
		LOCAL_NATIVE_COVERAGE :=

		# arch specific variables
		LOCAL_SRC_FILES_$(TARGET_ARCH):=

core/combo/TARGET_linux-arm.mk

+4 −1

Original line number	Diff line number	Diff line
		@@ -164,7 +164,7 @@ $(combo_2nd_arch_prefix)TARGET_LIBGCC := $(shell $($(combo_2nd_arch_prefix)TARGE
		$($(combo_2nd_arch_prefix)TARGET_GLOBAL_CFLAGS) -print-libgcc-file-name)
		$(combo_2nd_arch_prefix)TARGET_LIBATOMIC := $(shell $($(combo_2nd_arch_prefix)TARGET_CC) \
		$($(combo_2nd_arch_prefix)TARGET_GLOBAL_CFLAGS) -print-file-name=libatomic.a)
		target_libgcov := $(shell $($(combo_2nd_arch_prefix)TARGET_CC) $($(combo_2nd_arch_prefix)TARGET_GLOBAL_CFLAGS) \
		$(combo_2nd_arch_prefix)TARGET_LIBGCOV := $(shell $($(combo_2nd_arch_prefix)TARGET_CC) $($(combo_2nd_arch_prefix)TARGET_GLOBAL_CFLAGS) \
		-print-file-name=libgcov.a)
		endif

		@@ -213,6 +213,7 @@ $(hide) $(PRIVATE_CXX) \
		$(PRIVATE_TARGET_GLOBAL_LDFLAGS) \
		$(PRIVATE_LDFLAGS) \
		$(PRIVATE_TARGET_LIBATOMIC) \
		$(if $(filter true,$(NATIVE_COVERAGE)),$(PRIVATE_TARGET_LIBGCOV)) \
		$(if $(PRIVATE_LIBCXX),,$(PRIVATE_TARGET_LIBGCC)) \
		$(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTEND_SO_O)) \
		$(PRIVATE_LDLIBS)
		@@ -240,6 +241,7 @@ $(hide) $(PRIVATE_CXX) -nostdlib -Bdynamic -pie \
		$(PRIVATE_TARGET_GLOBAL_LDFLAGS) \
		$(PRIVATE_LDFLAGS) \
		$(PRIVATE_TARGET_LIBATOMIC) \
		$(if $(filter true,$(NATIVE_COVERAGE)),$(PRIVATE_TARGET_LIBGCOV)) \
		$(if $(PRIVATE_LIBCXX),,$(PRIVATE_TARGET_LIBGCC)) \
		$(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTEND_O)) \
		$(PRIVATE_LDLIBS)
		@@ -263,6 +265,7 @@ $(hide) $(PRIVATE_CXX) -nostdlib -Bstatic \
		$(call normalize-target-libraries,$(filter %libc_nomalloc.a,$(PRIVATE_ALL_STATIC_LIBRARIES))) \
		$(PRIVATE_TARGET_FDO_LIB) \
		$(PRIVATE_TARGET_LIBATOMIC) \
		$(if $(filter true,$(NATIVE_COVERAGE)),$(PRIVATE_TARGET_LIBGCOV)) \
		$(if $(PRIVATE_LIBCXX),,$(PRIVATE_TARGET_LIBGCC)) \
		-Wl,--end-group \
		$(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTEND_O))

core/combo/TARGET_linux-arm64.mk

+5 −0

Original line number	Diff line number	Diff line
		@@ -131,6 +131,8 @@ TARGET_LIBGCC := $(shell $(TARGET_CC) $(TARGET_GLOBAL_CFLAGS) \
		-print-libgcc-file-name)
		TARGET_LIBATOMIC := $(shell $(TARGET_CC) $(TARGET_GLOBAL_CFLAGS) \
		-print-file-name=libatomic.a)
		TARGET_LIBGCOV := $(shell $(TARGET_CC) $(TARGET_GLOBAL_CFLAGS) \
		-print-file-name=libgcov.a)

		KERNEL_HEADERS_COMMON := $(libc_root)/kernel/uapi
		KERNEL_HEADERS_ARCH := $(libc_root)/kernel/uapi/asm-$(TARGET_ARCH)
		@@ -177,6 +179,7 @@ $(hide) $(PRIVATE_CXX) \
		$(PRIVATE_TARGET_GLOBAL_LDFLAGS) \
		$(PRIVATE_LDFLAGS) \
		$(PRIVATE_TARGET_LIBATOMIC) \
		$(if $(filter true,$(NATIVE_COVERAGE)),$(PRIVATE_TARGET_LIBGCOV)) \
		$(if $(PRIVATE_LIBCXX),,$(PRIVATE_TARGET_LIBGCC)) \
		$(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTEND_SO_O)) \
		$(PRIVATE_LDLIBS)
		@@ -204,6 +207,7 @@ $(hide) $(PRIVATE_CXX) -nostdlib -Bdynamic -pie \
		$(PRIVATE_TARGET_GLOBAL_LDFLAGS) \
		$(PRIVATE_LDFLAGS) \
		$(PRIVATE_TARGET_LIBATOMIC) \
		$(if $(filter true,$(NATIVE_COVERAGE)),$(PRIVATE_TARGET_LIBGCOV)) \
		$(if $(PRIVATE_LIBCXX),,$(PRIVATE_TARGET_LIBGCC)) \
		$(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTEND_O)) \
		$(PRIVATE_LDLIBS)
		@@ -227,6 +231,7 @@ $(hide) $(PRIVATE_CXX) -nostdlib -Bstatic \
		$(call normalize-target-libraries,$(filter %libc_nomalloc.a,$(PRIVATE_ALL_STATIC_LIBRARIES))) \
		$(PRIVATE_TARGET_FDO_LIB) \
		$(PRIVATE_TARGET_LIBATOMIC) \
		$(if $(filter true,$(NATIVE_COVERAGE)),$(PRIVATE_TARGET_LIBGCOV)) \
		$(if $(PRIVATE_LIBCXX),,$(PRIVATE_TARGET_LIBGCC)) \
		-Wl,--end-group \
		$(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTEND_O))

core/combo/TARGET_linux-mips.mk

+4 −1

Original line number	Diff line number	Diff line
		@@ -136,7 +136,7 @@ LIBGCC_EH := $(shell $($(combo_2nd_arch_prefix)TARGET_CC) $($(combo_2nd_arch_pre
		ifneq ($(LIBGCC_EH),libgcc_eh.a)
		$(combo_2nd_arch_prefix)TARGET_LIBGCC += $(LIBGCC_EH)
		endif
		target_libgcov := $(shell $($(combo_2nd_arch_prefix)TARGET_CC) $($(combo_2nd_arch_prefix)TARGET_GLOBAL_CFLAGS) \
		$(combo_2nd_arch_prefix)TARGET_LIBGCOV := $(shell $($(combo_2nd_arch_prefix)TARGET_CC) $($(combo_2nd_arch_prefix)TARGET_GLOBAL_CFLAGS) \
		--print-file-name=libgcov.a)
		endif

		@@ -185,6 +185,7 @@ $(hide) $(PRIVATE_CXX) \
		$(PRIVATE_TARGET_GLOBAL_LDFLAGS) \
		$(PRIVATE_LDFLAGS) \
		$(PRIVATE_TARGET_LIBATOMIC) \
		$(if $(filter true,$(NATIVE_COVERAGE)),$(PRIVATE_TARGET_LIBGCOV)) \
		$(if $(PRIVATE_LIBCXX),,$(PRIVATE_TARGET_LIBGCC)) \
		$(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTEND_SO_O)) \
		$(PRIVATE_LDLIBS)
		@@ -212,6 +213,7 @@ $(hide) $(PRIVATE_CXX) -nostdlib -Bdynamic -pie \
		$(PRIVATE_TARGET_GLOBAL_LDFLAGS) \
		$(PRIVATE_LDFLAGS) \
		$(PRIVATE_TARGET_LIBATOMIC) \
		$(if $(filter true,$(NATIVE_COVERAGE)),$(PRIVATE_TARGET_LIBGCOV)) \
		$(if $(PRIVATE_LIBCXX),,$(PRIVATE_TARGET_LIBGCC)) \
		$(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTEND_O)) \
		$(PRIVATE_LDLIBS)
		@@ -235,6 +237,7 @@ $(hide) $(PRIVATE_CXX) -nostdlib -Bstatic \
		$(call normalize-target-libraries,$(filter %libc_nomalloc.a,$(PRIVATE_ALL_STATIC_LIBRARIES))) \
		$(PRIVATE_TARGET_FDO_LIB) \
		$(PRIVATE_TARGET_LIBATOMIC) \
		$(if $(filter true,$(NATIVE_COVERAGE)),$(PRIVATE_TARGET_LIBGCOV)) \
		$(if $(PRIVATE_LIBCXX),,$(PRIVATE_TARGET_LIBGCC)) \
		-Wl,--end-group \
		$(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTEND_O))