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

Commit 81c9d29d authored by Ryan Campbell's avatar Ryan Campbell
Browse files

Implement path-based enabling of code coverage. 

Native coverage is enabled by setting NATIVE_COVERAGE to true
and specifying a list of paths in the COVERAGE_PATHS
environment variable. Files are exported to a zip file in the
target out directory.

Change-Id: I66a2ddd88e849bec1cc0cdae1b51fe18a007e2c3
parent 946e58bd

core/Makefile

+23 −0
Original line number Diff line number Diff line
@@ -2059,6 +2059,28 @@ $(SYMBOLS_ZIP): $(SOONG_ZIP) 
	$(hide) mkdir -p $(dir $@) $(TARGET_OUT_UNSTRIPPED) $(dir $(PRIVATE_LIST_FILE))

	$(hide) find $(TARGET_OUT_UNSTRIPPED) | sort >$(PRIVATE_LIST_FILE)

	$(hide) $(SOONG_ZIP) -d -o $@ -C . -l $(PRIVATE_LIST_FILE)

# -----------------------------------------------------------------

# A zip of the coverage directory.

#

name := $(TARGET_PRODUCT)

ifeq ($(TARGET_BUILD_TYPE),debug)

name := $(name)_debug

endif

name := $(name)-coverage-$(FILE_NAME_TAG)

COVERAGE_ZIP := $(PRODUCT_OUT)/$(name).zip

ifndef TARGET_BUILD_APPS

$(COVERAGE_ZIP): $(INSTALLED_SYSTEMIMAGE) \

		$(INSTALLED_BOOTIMAGE_TARGET) \

		$(INSTALLED_USERDATAIMAGE_TARGET) \

		$(INSTALLED_VENDORIMAGE_TARGET)

endif

$(COVERAGE_ZIP): PRIVATE_LIST_FILE := $(call intermediates-dir-for,PACKAGING,coverage)/filelist

$(COVERAGE_ZIP): $(SOONG_ZIP)

	@echo "Package coverage: $@"

	$(hide) rm -rf $@ $(PRIVATE_LIST_FILE)

	$(hide) mkdir -p $(dir $@) $(TARGET_OUT_COVERAGE) $(dir $(PRIVATE_LIST_FILE))

	$(hide) find $(TARGET_OUT_COVERAGE) | sort >$(PRIVATE_LIST_FILE)

	$(hide) $(SOONG_ZIP) -d -o $@ -C $(TARGET_OUT_COVERAGE) -l $(PRIVATE_LIST_FILE)



# -----------------------------------------------------------------

# A zip of the Android Apps. Not keeping full path so that we don't
@@ -2217,6 +2239,7 @@ deps := \ 
	$(tools_notice_file_txt) \

	$(OUT_DOCS)/offline-sdk-timestamp \

	$(SYMBOLS_ZIP) \

	$(COVERAGE_ZIP) \

	$(INSTALLED_SYSTEMIMAGE) \

	$(INSTALLED_USERDATAIMAGE_TARGET) \

	$(INSTALLED_RAMDISK_TARGET) \

core/binary.mk

+14 −1
Original line number Diff line number Diff line
@@ -54,10 +54,15 @@ my_cxx := $(LOCAL_CXX) 
my_cxx_wrapper := $(CXX_WRAPPER)

my_c_includes := $(LOCAL_C_INCLUDES)

my_generated_sources := $(LOCAL_GENERATED_SOURCES)

my_native_coverage := $(LOCAL_NATIVE_COVERAGE)

my_additional_dependencies := $(LOCAL_ADDITIONAL_DEPENDENCIES)

my_export_c_include_dirs := $(LOCAL_EXPORT_C_INCLUDE_DIRS)



ifneq (,$(foreach dir,$(COVERAGE_PATHS),$(filter $(dir)%,$(LOCAL_PATH))))

  my_native_coverage := true

else

  my_native_coverage := false

endif



ifdef LOCAL_IS_HOST_MODULE

my_allow_undefined_symbols := true

else
@@ -1769,3 +1774,11 @@ SOONG_CONV.$(LOCAL_MODULE).DEPS := \ 
    $(my_system_shared_libraries)

SOONG_CONV := $(SOONG_CONV) $(LOCAL_MODULE)

endif



###########################################################

# Coverage packaging.

###########################################################

ifeq ($(my_native_coverage),true)

LOCAL_GCNO_FILES := $(patsubst %.o,%.gcno,$(all_objects))

$(foreach f,$(all_objects),$(eval $(call gcno-touch-rule,$(f),$(f:.o=.gcno))))

endif

core/clear_vars.mk

+1 −1
Original line number Diff line number Diff line
@@ -191,7 +191,6 @@ LOCAL_MODULE_UNSUPPORTED_HOST_CROSS_ARCH:= 
LOCAL_MODULE_UNSUPPORTED_HOST_CROSS_ARCH_WARN:=

LOCAL_NO_FPIE :=

LOCAL_CXX_STL := default

LOCAL_NATIVE_COVERAGE :=

LOCAL_DPI_VARIANTS:=

LOCAL_DPI_FILE_STEM:=

LOCAL_SANITIZE:=
@@ -236,6 +235,7 @@ LOCAL_CLANG_$(TARGET_ARCH):= 
LOCAL_PREBUILT_JNI_LIBS_$(TARGET_ARCH):=

LOCAL_STRIP_MODULE_$(TARGET_ARCH):=

LOCAL_PACK_MODULE_RELOCATIONS_$(TARGET_ARCH):=

LOCAL_GCNO_FILES:=

ifdef TARGET_2ND_ARCH

LOCAL_SRC_FILES_$(TARGET_2ND_ARCH):=

LOCAL_SRC_FILES_EXCLUDE_$(TARGET_2ND_ARCH):=

core/definitions.mk

+9 −0
Original line number Diff line number Diff line
@@ -123,6 +123,15 @@ define true-or-empty 
$(filter true, $(1))

endef



###########################################################

## Rule for touching GCNO files.

###########################################################

define gcno-touch-rule

$(2): $(1)

	touch -c $$@

endef



###########################################################



###########################################################

## Retrieve the directory of the current makefile

core/envsetup.mk

+3 −0
Original line number Diff line number Diff line
@@ -261,10 +261,12 @@ HOST_OUT_RENDERSCRIPT_BITCODE := $(HOST_OUT_SHARED_LIBRARIES) 
HOST_OUT_JAVA_LIBRARIES := $(HOST_OUT)/framework

HOST_OUT_SDK_ADDON := $(HOST_OUT)/sdk_addon

HOST_OUT_NATIVE_TESTS := $(HOST_OUT)/nativetest64

HOST_OUT_COVERAGE := $(HOST_OUT)/coverage



HOST_CROSS_OUT_EXECUTABLES := $(HOST_CROSS_OUT)/bin

HOST_CROSS_OUT_SHARED_LIBRARIES := $(HOST_CROSS_OUT)/lib

HOST_CROSS_OUT_NATIVE_TESTS := $(HOST_CROSS_OUT)/nativetest

HOST_CROSS_OUT_COVERAGE := $(HOST_CROSS_OUT)/coverage



HOST_OUT_INTERMEDIATES := $(HOST_OUT)/obj

HOST_OUT_HEADERS := $(HOST_OUT_INTERMEDIATES)/include
@@ -467,6 +469,7 @@ TARGET_OUT_VENDOR_SHARED_LIBRARIES_UNSTRIPPED := $(TARGET_OUT_UNSTRIPPED)/$(TARG 
TARGET_ROOT_OUT_UNSTRIPPED := $(TARGET_OUT_UNSTRIPPED)

TARGET_ROOT_OUT_SBIN_UNSTRIPPED := $(TARGET_OUT_UNSTRIPPED)/sbin

TARGET_ROOT_OUT_BIN_UNSTRIPPED := $(TARGET_OUT_UNSTRIPPED)/bin

TARGET_OUT_COVERAGE := $(PRODUCT_OUT)/coverages



TARGET_ROOT_OUT := $(PRODUCT_OUT)/$(TARGET_COPY_OUT_ROOT)

TARGET_ROOT_OUT_BIN := $(TARGET_ROOT_OUT)/bin