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

Commit d282426b authored by Dan Willemsen's avatar Dan Willemsen Committed by android-build-merger
Browse files

Merge "Support Soong native coverage" am: c9fa07c9 am: 0c2bd309 am: c9f5ca39 

am: ce18a0d8

Change-Id: I86d2e1e13367bbb728b5488742383149ad7bdd9b
parents d2b612eb ce18a0d8

core/clear_vars.mk

+1 −0
Original line number Diff line number Diff line
@@ -165,6 +165,7 @@ LOCAL_PACK_MODULE_RELOCATIONS:= 
LOCAL_PICKUP_FILES:=

LOCAL_POST_INSTALL_CMD:=

LOCAL_POST_LINK_CMD:=

LOCAL_PREBUILT_COVERAGE_ARCHIVE:=

LOCAL_PREBUILT_EXECUTABLES:=

LOCAL_PREBUILT_JAVA_LIBRARIES:=

LOCAL_PREBUILT_JNI_LIBS:=

core/prebuilt_internal.mk

+14 −0
Original line number Diff line number Diff line
@@ -174,6 +174,19 @@ endif 
endif  # my_strip_module not true



ifeq ($(NATIVE_COVERAGE),true)

ifneq (,$(strip $(LOCAL_PREBUILT_COVERAGE_ARCHIVE)))

  $(eval $(call copy-one-file,$(LOCAL_PREBUILT_COVERAGE_ARCHIVE),$(intermediates)/$(LOCAL_MODULE).gcnodir))

  ifneq ($(LOCAL_UNINSTALLABLE_MODULE),true)

    ifdef LOCAL_IS_HOST_MODULE

      my_coverage_path := $($(my_prefix)OUT_COVERAGE)/$(patsubst $($(my_prefix)OUT)/%,%,$(my_module_path))

    else

      my_coverage_path := $(TARGET_OUT_COVERAGE)/$(patsubst $(PRODUCT_OUT)/%,%,$(my_module_path))

    endif

    my_coverage_path := $(my_coverage_path)/$(basename $(my_installed_module_stem)).gcnodir

    $(eval $(call copy-one-file,$(LOCAL_PREBUILT_COVERAGE_ARCHIVE),$(my_coverage_path)))

    $(LOCAL_BUILT_MODULE): $(my_coverage_path)

  endif

else

# Coverage information is needed when static lib is a dependency of another

# coverage-enabled module.

ifeq (STATIC_LIBRARIES, $(LOCAL_MODULE_CLASS))
@@ -186,6 +199,7 @@ $(intermediates)/$(GCNO_ARCHIVE) : 
	$(transform-o-to-static-lib)

endif

endif

endif



ifeq ($(LOCAL_MODULE_CLASS),APPS)

PACKAGES.$(LOCAL_MODULE).OVERRIDES := $(strip $(LOCAL_OVERRIDES_PACKAGES))

core/shared_library_internal.mk

+1 −0
Original line number Diff line number Diff line
@@ -96,6 +96,7 @@ GCNO_ARCHIVE := $(basename $(my_installed_module_stem))$(gcno_suffix) 


$(intermediates)/$(GCNO_ARCHIVE) : PRIVATE_ALL_OBJECTS := $(strip $(LOCAL_GCNO_FILES))

$(intermediates)/$(GCNO_ARCHIVE) : PRIVATE_ALL_WHOLE_STATIC_LIBRARIES := $(strip $(built_whole_gcno_libraries)) $(strip $(built_static_gcno_libraries))

$(intermediates)/$(GCNO_ARCHIVE) : PRIVATE_INTERMEDIATES_DIR := $(intermediates)

$(intermediates)/$(GCNO_ARCHIVE) : $(LOCAL_GCNO_FILES) $(built_whole_gcno_libraries) $(built_static_gcno_libraries)

	$(transform-o-to-static-lib)

core/soong_config.mk

+3 −0
Original line number Diff line number Diff line
@@ -43,6 +43,9 @@ $(SOONG_VARIABLES): FORCE 
	echo '    "ClangTidy": $(if $(filter 1 true,$(WITH_TIDY)),true,false),'; \

	echo '    "TidyChecks": "$(WITH_TIDY_CHECKS)",'; \

	echo ''; \

	echo '    "NativeCoverage": $(if $(filter true,$(NATIVE_COVERAGE)),true,false),'; \

	echo '    "CoveragePaths": [$(if $(COVERAGE_PATHS),"$(subst $(space),"$(comma)",$(subst $(comma),$(space),$(COVERAGE_PATHS)))")],'; \

	echo ''; \

	echo '    "DeviceName": "$(TARGET_DEVICE)",'; \

	echo '    "DeviceArch": "$(TARGET_ARCH)",'; \

	echo '    "DeviceArchVariant": "$(TARGET_ARCH_VARIANT)",'; \

core/static_library_internal.mk

+1 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ $(intermediates)/$(GCNO_ARCHIVE) : PRIVATE_ALL_OBJECTS := $(strip $(LOCAL_GCNO_F 
$(intermediates)/$(GCNO_ARCHIVE) : PRIVATE_ALL_WHOLE_STATIC_LIBRARIES := $(strip $(built_whole_gcno_libraries))

$(intermediates)/$(GCNO_ARCHIVE) : PRIVATE_PREFIX := $(my_prefix)

$(intermediates)/$(GCNO_ARCHIVE) : PRIVATE_2ND_ARCH_VAR_PREFIX := $(LOCAL_2ND_ARCH_VAR_PREFIX)

$(intermediates)/$(GCNO_ARCHIVE) : PRIVATE_INTERMEDIATES_DIR := $(intermediates)

$(intermediates)/$(GCNO_ARCHIVE) : $(LOCAL_GCNO_FILES) $(built_whole_gcno_libraries)

	$(transform-o-to-static-lib)

endif