From 62f2e56c7201de66649884c5df006c662c3a8a9a Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Mon, 1 Feb 2016 18:55:23 -0800 Subject: [PATCH] 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 --- core/binary.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core/binary.mk b/core/binary.mk index d8b681630..f33f67621 100644 --- a/core/binary.mk +++ b/core/binary.mk @@ -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) \