Merge "Use c and cpp objects for gcov."

2017-03-01 03:05:55 +00:00 · 2017-03-01 03:05:55 +00:00 · d579b8eb1f
parent 569cb34dc0 5a6ea36cb8
commit d579b8eb1f
1 changed files with 10 additions and 2 deletions
--- a/core/binary.mk
+++ b/core/binary.mk
@ -1859,6 +1859,14 @@ endif
 # 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