commit c1d7537d99b21a0796e8142b75d4886745a7e3cc
author Treehugger Robot <treehugger-gerrit@google.com> Mon Nov 20 23:04:38 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Nov 20 23:04:38 2017 +0000
tree fe15d24dfc981915b6a393867820742cd16ccb1d
parent db7dfacb96930d4473de5a45562daeaa4ebfbb46
parent ba9badf8ec251cc5deea155731dd4293b2489a93

Merge "Switch gcnodir name from basename to just removing .so"

core/prebuilt_internal.mk

diff --git a/core/prebuilt_internal.mk b/core/prebuilt_internal.mk
index 3fec8d9..47bd1b2 100644
--- a/core/prebuilt_internal.mk
+++ b/core/prebuilt_internal.mk
@@ -216,7 +216,7 @@
     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