From ba9badf8ec251cc5deea155731dd4293b2489a93 Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Mon, 20 Nov 2017 12:45:48 -0800 Subject: [PATCH] Switch gcnodir name from basename to just removing .so $(basename) was catching all of the hidl services that have versions like "1.0" in their name, marking the .0-service portion as a suffix to be removed. Instead just remove ".so" and assume that everything else isn't actually a suffix. Bug: 69271974 Test: NATIVE_COVERAGE=true COVERAGE_PATHS=hardware/interfaces m; compare ninja files Change-Id: I76e27d9ab1f9d4862cc2607c5f2ed9c121879421 --- core/prebuilt_internal.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/prebuilt_internal.mk b/core/prebuilt_internal.mk index 3fec8d9b3..47bd1b26b 100644 --- a/core/prebuilt_internal.mk +++ b/core/prebuilt_internal.mk @@ -216,7 +216,7 @@ ifneq (,$(strip $(LOCAL_PREBUILT_COVERAGE_ARCHIVE))) 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 + 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