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

Commit 62f2e56c authored by Dan Willemsen's avatar Dan Willemsen
Browse files

Track ObjC object mapping 

Objective-C .m/.mm files were not being tracked, so they were showing
up as unused source files (on Darwin). They were also triggering an
internal build system warning because the new object list did not
match the current list.

Change-Id: I01fff8c5587fe168106c60782080d60744311f6f
parent e786d218

core/binary.mk

+2 −0
Original line number Diff line number Diff line
@@ -1013,6 +1013,7 @@ endif 


objc_sources := $(filter %.m,$(my_src_files))

objc_objects := $(addprefix $(intermediates)/,$(objc_sources:.m=.o))

$(call track-src-file-obj,$(objc_sources),$(objc_objects))



ifneq ($(strip $(objc_objects)),)

$(objc_objects): $(intermediates)/%.o: $(TOPDIR)$(LOCAL_PATH)/%.m $(yacc_cpps) $(proto_generated_headers) \
@@ -1027,6 +1028,7 @@ endif 


objcpp_sources := $(filter %.mm,$(my_src_files))

objcpp_objects := $(addprefix $(intermediates)/,$(objcpp_sources:.mm=.o))

$(call track-src-file-obj,$(objcpp_sources),$(objcpp_objects))



ifneq ($(strip $(objcpp_objects)),)

$(objcpp_objects): $(intermediates)/%.o: $(TOPDIR)$(LOCAL_PATH)/%.mm $(yacc_cpps) $(proto_generated_headers) \