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

Commit f051a86c authored by Cole Faust's avatar Cole Faust
Browse files

Remove gcov-report-files-all.zip 

This artifact exists on some CI builds, like
aosp_cf_x86_64_only_phone-trunk_staging-userdebug_coverage,
aosp_cf_x86_64_phone-trunk_staging-userdebug_coverage_bionic, and
cf_x86_64_phone-trunk_staging-userdebug_coverage, but it's always
an empty zip. I checked with qingshen@ and she confirmed it's deprecated
and unused. Remove it.

Also remove all usages of the *_OUT_COVERAGE variables as they were
only used for building this zip.

Bug: 413425319
Test: Presubmits
Change-Id: I0f9a5ab219720c250bbf81323e29451f3aa88bd1
parent f5613b81

core/Makefile

+0 −25
Original line number Original line Diff line number Diff line
@@ -7268,31 +7268,6 @@ endif 




_symbols_zip_modules_symbols_files :=

_symbols_zip_modules_symbols_files :=

_symbols_zip_modules_mapping_files :=

_symbols_zip_modules_mapping_files :=

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

# A zip of the coverage directory.

#

name := gcov-report-files-all

ifeq ($(TARGET_BUILD_TYPE),debug)

name := $(name)_debug

endif

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

ifeq (,$(TARGET_BUILD_UNBUNDLED))

$(COVERAGE_ZIP): $(INTERNAL_ALLIMAGES_FILES)

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)



$(call declare-1p-container,$(COVERAGE_ZIP),)

ifeq (,$(TARGET_BUILD_UNBUNDLED))

$(call declare-container-license-deps,$(COVERAGE_ZIP),$(INTERNAL_ALLIMAGE_FILES),$(PRODUCT_OUT)/:/)

endif



SYSTEM_NOTICE_DEPS += $(COVERAGE_ZIP)





ifeq (true,$(EMMA_INSTRUMENT))

ifeq (true,$(EMMA_INSTRUMENT))

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

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

core/cc_prebuilt_internal.mk

+0 −10
Original line number Original line Diff line number Diff line
@@ -183,16 +183,6 @@ include $(BUILD_SYSTEM)/check_elf_file.mk 
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).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)/$(patsubst %.so,%,$(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

else

# 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.

core/envsetup.mk

+1 −7
Original line number Original line Diff line number Diff line
@@ -415,7 +415,6 @@ HOST_OUT_RENDERSCRIPT_BITCODE := $(HOST_OUT_SHARED_LIBRARIES) 
HOST_OUT_JAVA_LIBRARIES := $(HOST_OUT)/framework

HOST_OUT_JAVA_LIBRARIES := $(HOST_OUT)/framework

HOST_OUT_SDK_ADDON := $(HOST_OUT)/sdk_addon

HOST_OUT_SDK_ADDON := $(HOST_OUT)/sdk_addon

HOST_OUT_NATIVE_TESTS := $(HOST_OUT)/nativetest64

HOST_OUT_NATIVE_TESTS := $(HOST_OUT)/nativetest64

HOST_OUT_COVERAGE := $(HOST_OUT)/coverage

HOST_OUT_TESTCASES := $(HOST_OUT)/testcases

HOST_OUT_TESTCASES := $(HOST_OUT)/testcases

HOST_OUT_ETC := $(HOST_OUT)/etc

HOST_OUT_ETC := $(HOST_OUT)/etc

.KATI_READONLY := \

.KATI_READONLY := \
@@ -425,20 +424,17 @@ HOST_OUT_ETC := $(HOST_OUT)/etc 
  HOST_OUT_JAVA_LIBRARIES \

  HOST_OUT_JAVA_LIBRARIES \

  HOST_OUT_SDK_ADDON \

  HOST_OUT_SDK_ADDON \

  HOST_OUT_NATIVE_TESTS \

  HOST_OUT_NATIVE_TESTS \

  HOST_OUT_COVERAGE \

  HOST_OUT_TESTCASES \

  HOST_OUT_TESTCASES \

  HOST_OUT_ETC

  HOST_OUT_ETC





HOST_CROSS_OUT_EXECUTABLES := $(HOST_CROSS_OUT)/bin

HOST_CROSS_OUT_EXECUTABLES := $(HOST_CROSS_OUT)/bin

HOST_CROSS_OUT_SHARED_LIBRARIES := $(HOST_CROSS_OUT)/lib

HOST_CROSS_OUT_SHARED_LIBRARIES := $(HOST_CROSS_OUT)/lib

HOST_CROSS_OUT_NATIVE_TESTS := $(HOST_CROSS_OUT)/nativetest

HOST_CROSS_OUT_NATIVE_TESTS := $(HOST_CROSS_OUT)/nativetest

HOST_CROSS_OUT_COVERAGE := $(HOST_CROSS_OUT)/coverage

HOST_CROSS_OUT_TESTCASES := $(HOST_CROSS_OUT)/testcases

HOST_CROSS_OUT_TESTCASES := $(HOST_CROSS_OUT)/testcases

.KATI_READONLY := \

.KATI_READONLY := \

  HOST_CROSS_OUT_EXECUTABLES \

  HOST_CROSS_OUT_EXECUTABLES \

  HOST_CROSS_OUT_SHARED_LIBRARIES \

  HOST_CROSS_OUT_SHARED_LIBRARIES \

  HOST_CROSS_OUT_NATIVE_TESTS \

  HOST_CROSS_OUT_NATIVE_TESTS \

  HOST_CROSS_OUT_COVERAGE \

  HOST_CROSS_OUT_TESTCASES

  HOST_CROSS_OUT_TESTCASES





HOST_OUT_INTERMEDIATES := $(HOST_OUT)/obj

HOST_OUT_INTERMEDIATES := $(HOST_OUT)/obj
@@ -993,15 +989,13 @@ TARGET_OUT_SHARED_LIBRARIES_UNSTRIPPED := $(TARGET_OUT_UNSTRIPPED)/system/lib 
TARGET_OUT_VENDOR_SHARED_LIBRARIES_UNSTRIPPED := $(TARGET_OUT_UNSTRIPPED)/$(TARGET_COPY_OUT_VENDOR)/lib

TARGET_OUT_VENDOR_SHARED_LIBRARIES_UNSTRIPPED := $(TARGET_OUT_UNSTRIPPED)/$(TARGET_COPY_OUT_VENDOR)/lib

TARGET_ROOT_OUT_UNSTRIPPED := $(TARGET_OUT_UNSTRIPPED)

TARGET_ROOT_OUT_UNSTRIPPED := $(TARGET_OUT_UNSTRIPPED)

TARGET_ROOT_OUT_BIN_UNSTRIPPED := $(TARGET_OUT_UNSTRIPPED)/bin

TARGET_ROOT_OUT_BIN_UNSTRIPPED := $(TARGET_OUT_UNSTRIPPED)/bin

TARGET_OUT_COVERAGE := $(PRODUCT_OUT)/coverage

.KATI_READONLY := \

.KATI_READONLY := \

  TARGET_OUT_UNSTRIPPED \

  TARGET_OUT_UNSTRIPPED \

  TARGET_OUT_EXECUTABLES_UNSTRIPPED \

  TARGET_OUT_EXECUTABLES_UNSTRIPPED \

  TARGET_OUT_SHARED_LIBRARIES_UNSTRIPPED \

  TARGET_OUT_SHARED_LIBRARIES_UNSTRIPPED \

  TARGET_OUT_VENDOR_SHARED_LIBRARIES_UNSTRIPPED \

  TARGET_OUT_VENDOR_SHARED_LIBRARIES_UNSTRIPPED \

  TARGET_ROOT_OUT_UNSTRIPPED \

  TARGET_ROOT_OUT_UNSTRIPPED \

  TARGET_ROOT_OUT_BIN_UNSTRIPPED \

  TARGET_ROOT_OUT_BIN_UNSTRIPPED

  TARGET_OUT_COVERAGE





TARGET_RAMDISK_OUT := $(PRODUCT_OUT)/$(TARGET_COPY_OUT_RAMDISK)

TARGET_RAMDISK_OUT := $(PRODUCT_OUT)/$(TARGET_COPY_OUT_RAMDISK)

TARGET_RAMDISK_OUT_UNSTRIPPED := $(TARGET_OUT_UNSTRIPPED)

TARGET_RAMDISK_OUT_UNSTRIPPED := $(TARGET_OUT_UNSTRIPPED)

core/executable_internal.mk

+0 −11
Original line number Original line Diff line number Diff line
@@ -90,12 +90,6 @@ built_static_gcno_libraries := \ 
        STATIC_LIBRARIES,$(lib),$(my_kind),,$(LOCAL_2ND_ARCH_VAR_PREFIX), \

        STATIC_LIBRARIES,$(lib),$(my_kind),,$(LOCAL_2ND_ARCH_VAR_PREFIX), \

        $(my_host_cross))/$(lib)$(gcno_suffix))

        $(my_host_cross))/$(lib)$(gcno_suffix))





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



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) : $(SOONG_ZIP) $(MERGE_ZIPS)
@@ -103,11 +97,6 @@ $(intermediates)/$(GCNO_ARCHIVE) : PRIVATE_ALL_OBJECTS := $(strip $(LOCAL_GCNO_F 
$(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) : $(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)

	$(package-coverage-files)

	$(package-coverage-files)



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

	$(copy-file-to-target)



$(LOCAL_BUILT_MODULE): $(my_coverage_path)/$(GCNO_ARCHIVE)

endif

endif





$(if $(my_register_name),$(eval ALL_MODULES.$(my_register_name).MAKE_MODULE_TYPE:=EXECUTABLE))

$(if $(my_register_name),$(eval ALL_MODULES.$(my_register_name).MAKE_MODULE_TYPE:=EXECUTABLE))

core/shared_library_internal.mk

+0 −11
Original line number Original line Diff line number Diff line
@@ -81,12 +81,6 @@ built_static_gcno_libraries := \ 
        STATIC_LIBRARIES,$(lib),$(my_kind),,$(LOCAL_2ND_ARCH_VAR_PREFIX), \

        STATIC_LIBRARIES,$(lib),$(my_kind),,$(LOCAL_2ND_ARCH_VAR_PREFIX), \

        $(my_host_cross))/$(lib)$(gcno_suffix))

        $(my_host_cross))/$(lib)$(gcno_suffix))





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



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) : $(SOONG_ZIP) $(MERGE_ZIPS)
@@ -94,11 +88,6 @@ $(intermediates)/$(GCNO_ARCHIVE) : PRIVATE_ALL_OBJECTS := $(strip $(LOCAL_GCNO_F 
$(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) : $(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)

	$(package-coverage-files)

	$(package-coverage-files)



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

	$(copy-file-to-target)



$(LOCAL_BUILT_MODULE): $(my_coverage_path)/$(GCNO_ARCHIVE)

endif

endif





$(if $(my_register_name),$(eval ALL_MODULES.$(my_register_name).MAKE_MODULE_TYPE:=SHARED_LIBRARY))

$(if $(my_register_name),$(eval ALL_MODULES.$(my_register_name).MAKE_MODULE_TYPE:=SHARED_LIBRARY))