commit d579b8eb1f52d2ab26803104ed70baba7d7b8732
author Ryan Campbell <ryanjcampbell@google.com> Wed Mar 01 03:05:55 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Mar 01 03:05:56 2017 +0000
tree 09dc0a2b901c5da6076291077d3c63c9cc04235f
parent 569cb34dc0a3a51a63d6ffab3739cf044f1315ed
parent 5a6ea36cb890188de402b7df2f3bf06229360e11

Merge "Use c and cpp objects for gcov."

core/binary.mk

diff --git a/core/binary.mk b/core/binary.mk
index 34bbe4e..ecf38d2 100644
--- a/core/binary.mk
+++ b/core/binary.mk
@@ -1859,6 +1859,14 @@
 # Coverage packaging.
 ###########################################################
 ifeq ($(my_native_coverage),true)
-LOCAL_GCNO_FILES := $(patsubst %.o,%.gcno,$(all_objects))
-$(foreach f,$(all_objects),$(eval $(call gcno-touch-rule,$(f),$(f:.o=.gcno))))
+my_gcno_objects := \
+    $(cpp_objects) \
+    $(gen_cpp_objects) \
+    $(c_objects) \
+    $(gen_c_objects) \
+    $(objc_objects) \
+    $(objcpp_objects)
+
+LOCAL_GCNO_FILES := $(patsubst %.o,%.gcno,$(my_gcno_objects))
+$(foreach f,$(my_gcno_objects),$(eval $(call gcno-touch-rule,$(f),$(f:.o=.gcno))))
 endif