From 4a3be3db47ce3881060d99a188812996ef0c61e3 Mon Sep 17 00:00:00 2001 From: Ryan Campbell Date: Mon, 17 Oct 2016 15:43:21 -0700 Subject: [PATCH] Fix bug preventing multi-module native coverage. Fix a whitespace bug causing coverage to be enabled on all modules whenever more than one module is specified. This is caused by comparing whitespace to the empty string, which are not equal. Fix by stripping the output to check for path matches. Test: tested using local build with coverage enabled on NFC, lights Change-Id: I61a775cfd135f94ea1e1ee9fdbed3c64c5bb1a2e --- core/binary.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/binary.mk b/core/binary.mk index c682d4e6b7..aca32d779b 100644 --- a/core/binary.mk +++ b/core/binary.mk @@ -58,7 +58,7 @@ my_additional_dependencies := $(LOCAL_ADDITIONAL_DEPENDENCIES) my_export_c_include_dirs := $(LOCAL_EXPORT_C_INCLUDE_DIRS) my_export_c_include_deps := $(LOCAL_EXPORT_C_INCLUDE_DEPS) -ifneq (,$(foreach dir,$(COVERAGE_PATHS),$(filter $(dir)%,$(LOCAL_PATH)))) +ifneq (,$(strip $(foreach dir,$(COVERAGE_PATHS),$(filter $(dir)%,$(LOCAL_PATH))))) my_native_coverage := true else my_native_coverage := false