am 69d5bd7c: am e266873b: am 1a8f0d3b: Merge "Move comment out of recipe section"

* commit '69d5bd7cbc873c86685c463ac3dc7ab8de9e71e7':
  Move comment out of recipe section
This commit is contained in:
Stephen Hines 2014-06-06 21:33:48 +00:00 committed by Android Git Automerger
commit d17e71f185

View file

@ -426,8 +426,8 @@ rs_generated_cpps := $(addprefix \
$(renderscript_intermediate)/ScriptC_,$(patsubst %.fs,%.cpp, $(patsubst %.rs,%.cpp, \
$(notdir $(renderscript_sources)))))
# This is just a dummy rule to make sure gmake doesn't skip updating the dependents.
$(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)
@ -478,8 +478,8 @@ $(proto_generated_cc_sources): PRIVATE_PROTOC_FLAGS := $(LOCAL_PROTOC_FLAGS)
$(proto_generated_cc_sources): $(proto_generated_cc_sources_dir)/%.pb.cc: %.proto $(PROTOC)
$(transform-proto-to-cc)
# This is just a dummy rule to make sure gmake doesn't skip updating the dependents.
$(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.
@echo "Updated header file $@."
$(my_prefix)_$(LOCAL_MODULE_CLASS)_$(LOCAL_MODULE)_proto_defined := true