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

Commit d09d3283 authored by Oliver Nguyen's avatar Oliver Nguyen Committed by android-build-merger
Browse files

Merge "Package coverage files as a zip." am: 6aef14d0 am: dcb71cf2 

am: 6f69d216

Change-Id: I40f079ed3206106f82fad6cd13d3358fe1e21584
parents 899016b4 6f69d216

core/Makefile

+1 −2
Original line number Original line Diff line number Diff line
@@ -4342,11 +4342,10 @@ $(SYMBOLS_ZIP): $(SOONG_ZIP) 
# -----------------------------------------------------------------

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

# A zip of the coverage directory.

# A zip of the coverage directory.

#

#

name := $(TARGET_PRODUCT)

name := gcov-report-files-all

ifeq ($(TARGET_BUILD_TYPE),debug)

ifeq ($(TARGET_BUILD_TYPE),debug)

name := $(name)_debug

name := $(name)_debug

endif

endif

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

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

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

ifndef TARGET_BUILD_APPS

ifndef TARGET_BUILD_APPS

$(COVERAGE_ZIP): $(INSTALLED_SYSTEMIMAGE_TARGET) \

$(COVERAGE_ZIP): $(INSTALLED_SYSTEMIMAGE_TARGET) \

core/definitions.mk

+10 −0
Original line number Original line Diff line number Diff line
@@ -1838,6 +1838,16 @@ define transform-host-o-to-executable 
$(transform-host-o-to-executable-inner)

$(transform-host-o-to-executable-inner)

endef

endef





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

## Commands for packaging native coverage files

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

define package-coverage-files

  @rm -f $@ $@.lst $@.premerged

  @touch $@.lst

  $(foreach obj,$(strip $(PRIVATE_ALL_OBJECTS)), $(hide) echo $(obj) >> $@.lst$(newline))

  $(hide) $(SOONG_ZIP) -o $@.premerged -C $(OUT_DIR) -l $@.lst

  $(hide) $(MERGE_ZIPS) -ignore-duplicates $@ $@.premerged $(strip $(PRIVATE_ALL_WHOLE_STATIC_LIBRARIES))

endef





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

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

## Commands for running javac to make .class files

## Commands for running javac to make .class files

core/executable_internal.mk

+3 −3
Original line number Original line Diff line number Diff line
@@ -84,7 +84,7 @@ $(linked_module): $(my_target_crtbegin_dynamic_o) $(all_objects) $(all_libraries 
endif

endif





ifeq ($(my_native_coverage),true)

ifeq ($(my_native_coverage),true)

gcno_suffix := .gcnodir

gcno_suffix := .zip





built_whole_gcno_libraries := \

built_whole_gcno_libraries := \

    $(foreach lib,$(my_whole_static_libraries), \

    $(foreach lib,$(my_whole_static_libraries), \
@@ -106,11 +106,11 @@ endif 




GCNO_ARCHIVE := $(my_installed_module_stem)$(gcno_suffix)

GCNO_ARCHIVE := $(my_installed_module_stem)$(gcno_suffix)





$(intermediates)/$(GCNO_ARCHIVE) : $(SOONG_ZIP) $(MERGE_ZIPS)

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

$(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_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)

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

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

	$(package-coverage-files)





$(my_coverage_path)/$(GCNO_ARCHIVE) : $(intermediates)/$(GCNO_ARCHIVE)

$(my_coverage_path)/$(GCNO_ARCHIVE) : $(intermediates)/$(GCNO_ARCHIVE)

	$(copy-file-to-target)

	$(copy-file-to-target)

core/shared_library_internal.mk

+3 −3
Original line number Original line Diff line number Diff line
@@ -77,7 +77,7 @@ $(linked_module): \ 
	$(transform-o-to-shared-lib)

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





ifeq ($(my_native_coverage),true)

ifeq ($(my_native_coverage),true)

gcno_suffix := .gcnodir

gcno_suffix := .zip





built_whole_gcno_libraries := \

built_whole_gcno_libraries := \

    $(foreach lib,$(my_whole_static_libraries), \

    $(foreach lib,$(my_whole_static_libraries), \
@@ -99,11 +99,11 @@ endif 




GCNO_ARCHIVE := $(basename $(my_installed_module_stem))$(gcno_suffix)

GCNO_ARCHIVE := $(basename $(my_installed_module_stem))$(gcno_suffix)





$(intermediates)/$(GCNO_ARCHIVE) : $(SOONG_ZIP) $(MERGE_ZIPS)

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

$(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_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)

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

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

	$(package-coverage-files)





$(my_coverage_path)/$(GCNO_ARCHIVE) : $(intermediates)/$(GCNO_ARCHIVE)

$(my_coverage_path)/$(GCNO_ARCHIVE) : $(intermediates)/$(GCNO_ARCHIVE)

	$(copy-file-to-target)

	$(copy-file-to-target)

core/soong_cc_prebuilt.mk

+5 −6
Original line number Original line Diff line number Diff line
@@ -187,14 +187,14 @@ endif 




ifeq ($(NATIVE_COVERAGE),true)

ifeq ($(NATIVE_COVERAGE),true)

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

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

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

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

    ifneq ($(LOCAL_UNINSTALLABLE_MODULE),true)

    ifneq ($(LOCAL_UNINSTALLABLE_MODULE),true)

      ifdef LOCAL_IS_HOST_MODULE

      ifdef LOCAL_IS_HOST_MODULE

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

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

      else

      else

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

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

      endif

      endif

      my_coverage_path := $(my_coverage_path)/$(patsubst %.so,%,$(my_installed_module_stem)).gcnodir

      my_coverage_path := $(my_coverage_path)/$(patsubst %.so,%,$(my_installed_module_stem)).zip

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

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

      $(LOCAL_BUILT_MODULE): $(my_coverage_path)

      $(LOCAL_BUILT_MODULE): $(my_coverage_path)

    endif

    endif
@@ -202,13 +202,12 @@ ifeq ($(NATIVE_COVERAGE),true) 
    # Coverage information is needed when static lib is a dependency of another

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

    # coverage-enabled module.

    # coverage-enabled module.

    ifeq (STATIC_LIBRARIES, $(LOCAL_MODULE_CLASS))

    ifeq (STATIC_LIBRARIES, $(LOCAL_MODULE_CLASS))

      GCNO_ARCHIVE := $(LOCAL_MODULE).gcnodir

      GCNO_ARCHIVE := $(LOCAL_MODULE).zip

      $(intermediates)/$(GCNO_ARCHIVE) : $(SOONG_ZIP) $(MERGE_ZIPS)

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

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

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

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

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

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

      $(intermediates)/$(GCNO_ARCHIVE) :

      $(intermediates)/$(GCNO_ARCHIVE) :

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

	$(package-coverage-files)

    endif

    endif

  endif

  endif

endif

endif