diff --git a/core/binary.mk b/core/binary.mk index f2ae0f58ed..45ab0c00c5 100644 --- a/core/binary.mk +++ b/core/binary.mk @@ -425,6 +425,8 @@ rs_generated_cpps := $(addprefix \ $(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) @@ -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 # 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 e35d36fec5..dcc5b39e89 100644 --- a/core/definitions.mk +++ b/core/definitions.mk @@ -903,7 +903,7 @@ $(hide) $(PRIVATE_RS_CC) \ -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 $@