Merge "Track ObjC object mapping" am: fedafc879d
am: d3212f55c3
* commit 'd3212f55c3ee2b762144089a932e8995519b0a57':
Track ObjC object mapping
This commit is contained in:
commit
f244691a14
|
@ -1015,6 +1015,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) \
|
||||
|
@ -1029,6 +1030,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) \
|
||||
|
|
Loading…
Reference in New Issue