am 834ec0ea: am d3ddfdf8: am b3bed595: Merge "Add a dummy build recipe for generated RS cpp files."
* commit '834ec0ead591cf64a5f660af0210e95728e08c4f':
Add a dummy build recipe for generated RS cpp files.
diff --git a/core/binary.mk b/core/binary.mk
index 9199aa2..f0e8882 100644
--- a/core/binary.mk
+++ b/core/binary.mk
@@ -427,6 +427,8 @@
$(notdir $(renderscript_sources)))))
$(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_generated_sources += $(rs_generated_cpps)
@@ -478,7 +480,7 @@
$(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 $<."
+ @echo "Updated header file $@."
$(my_prefix)_$(LOCAL_MODULE_CLASS)_$(LOCAL_MODULE)_proto_defined := true
endif # transform-proto-to-cc rule included only once
diff --git a/core/definitions.mk b/core/definitions.mk
index a006899..ca83998 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -903,7 +903,7 @@
-a $@ -MD \
-reflect-c++ \
$(PRIVATE_RS_FLAGS) \
- $(foreach inc,$(PRIVATE_RS_INCLUDES),$(addprefix -I , $(inc))) \
+ $(addprefix -I , $(PRIVATE_RS_INCLUDES)) \
$(PRIVATE_RS_SOURCE_FILES)
$(hide) mkdir -p $(dir $@)
$(hide) touch $@