am d3ddfdf8: am b3bed595: Merge "Add a dummy build recipe for generated RS cpp files."

* commit 'd3ddfdf847eaf44219943cda441273be85b01635':
  Add a dummy build recipe for generated RS cpp files.
This commit is contained in:
Ying Wang 2014-05-28 23:41:42 +00:00 committed by Android Git Automerger
commit 834ec0ead5
2 changed files with 4 additions and 2 deletions

View File

@ -425,6 +425,8 @@ rs_generated_cpps := $(addprefix \
$(notdir $(renderscript_sources))))) $(notdir $(renderscript_sources)))))
$(rs_generated_cpps) : $(RenderScript_file_stamp) $(rs_generated_cpps) : $(RenderScript_file_stamp)
# This is just a dummy rule to make sure gmake doesn't skip updating the dependents.
@echo "Updated RS generated cpp file $@."
my_c_includes += $(renderscript_intermediate) my_c_includes += $(renderscript_intermediate)
my_generated_sources += $(rs_generated_cpps) my_generated_sources += $(rs_generated_cpps)
@ -473,7 +475,7 @@ $(proto_generated_cc_sources): $(proto_generated_cc_sources_dir)/%.pb.cc: %.prot
$(proto_generated_headers): $(proto_generated_cc_sources_dir)/%.pb.h: $(proto_generated_cc_sources_dir)/%.pb.cc $(proto_generated_headers): $(proto_generated_cc_sources_dir)/%.pb.h: $(proto_generated_cc_sources_dir)/%.pb.cc
# This is just a dummy rule to make sure gmake doesn't skip updating the dependents. # This is just a dummy rule to make sure gmake doesn't skip updating the dependents.
@echo "Updated header file $<." @echo "Updated header file $@."
$(my_prefix)_$(LOCAL_MODULE_CLASS)_$(LOCAL_MODULE)_proto_defined := true $(my_prefix)_$(LOCAL_MODULE_CLASS)_$(LOCAL_MODULE)_proto_defined := true
endif # transform-proto-to-cc rule included only once endif # transform-proto-to-cc rule included only once

View File

@ -903,7 +903,7 @@ $(hide) $(PRIVATE_RS_CC) \
-a $@ -MD \ -a $@ -MD \
-reflect-c++ \ -reflect-c++ \
$(PRIVATE_RS_FLAGS) \ $(PRIVATE_RS_FLAGS) \
$(foreach inc,$(PRIVATE_RS_INCLUDES),$(addprefix -I , $(inc))) \ $(addprefix -I , $(PRIVATE_RS_INCLUDES)) \
$(PRIVATE_RS_SOURCE_FILES) $(PRIVATE_RS_SOURCE_FILES)
$(hide) mkdir -p $(dir $@) $(hide) mkdir -p $(dir $@)
$(hide) touch $@ $(hide) touch $@