Merge "Rust: Collect gnco files with CLANG_COVERAGE too."

This commit is contained in:
Ivan Lozano 2020-11-17 13:06:14 +00:00 committed by Gerrit Code Review
commit 82a58294cc

View file

@ -82,8 +82,19 @@ ifndef LOCAL_IS_HOST_MODULE
endif endif
endif endif
create_coverage_zip :=
ifeq ($(NATIVE_COVERAGE),true) ifeq ($(NATIVE_COVERAGE),true)
create_coverage_zip := true
endif
# Until Rust supports LLVM coverage, Soong assumes GCOV coverage in both cases.
# Therefore we should create the coverage zip with the gcno files in this case as well.
ifeq ($(CLANG_COVERAGE),true)
create_coverage_zip := true
endif
ifdef create_coverage_zip
ifneq (,$(strip $(LOCAL_PREBUILT_COVERAGE_ARCHIVE))) ifneq (,$(strip $(LOCAL_PREBUILT_COVERAGE_ARCHIVE)))
$(eval $(call copy-one-file,$(LOCAL_PREBUILT_COVERAGE_ARCHIVE),$(intermediates)/$(LOCAL_MODULE).zip)) $(eval $(call copy-one-file,$(LOCAL_PREBUILT_COVERAGE_ARCHIVE),$(intermediates)/$(LOCAL_MODULE).zip))
ifneq ($(LOCAL_UNINSTALLABLE_MODULE),true) ifneq ($(LOCAL_UNINSTALLABLE_MODULE),true)