Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5a6ea36c authored by Ryan Campbell's avatar Ryan Campbell
Browse files

Use c and cpp objects for gcov. 

Instead of using all_objects and translating .o to .gcno, use
cpp_objects, gen_cpp_objects, c_objects, gen_c_objects, objc_objects,
and objcpp_objects. Fixes bug with .s files breaking coverage builds.

Bug: 35843991
Test: lunch sailfish-userdebug && make -j60 NATIVE_COVERAGE=true
COVERAGE_PATHS="vendor/google_devices/marlin/proprietary/mm-camera/mm-camera2"
Change-Id: Ib2f8eef889f075ec82f79d8c3ae0fe31962b653d
parent 93de7774

core/binary.mk

+10 −2
Original line number Diff line number Diff line
@@ -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