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

Commit d3212f55 authored by Dan Willemsen's avatar Dan Willemsen Committed by android-build-merger
Browse files

Merge "Track ObjC object mapping" 

am: fedafc87

* commit 'fedafc87':
  Track ObjC object mapping
parents 2f4b8a04 fedafc87

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) \