commit 24c7289d242254545785c7cab237fc369b9072f9
author Ulas Kirazci <ulas@google.com> Thu Jul 25 19:35:28 2013 +0000
committer Ulas Kirazci <ulas@google.com> Thu Jul 25 19:35:28 2013 +0000
tree 129336ec6e67566f4e410528ebe492c8b05a0370
parent 28b46fc16c026365378909f1cc88fad0d3b2395c

Revert "Allow proto builds to pass in java proto params."

This reverts commit 28b46fc16c026365378909f1cc88fad0d3b2395c.

Change-Id: Iaca9fa749c6f460911cc46e08e6b3ae2555b8bcc

core/definitions.mk

diff --git a/core/definitions.mk b/core/definitions.mk
index 4da78de..7834baa 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -889,11 +889,13 @@
 @echo "Protoc: $@ <= $(PRIVATE_PROTO_SRC_FILES)"
 @rm -rf $(PRIVATE_PROTO_JAVA_OUTPUT_DIR)
 @mkdir -p $(PRIVATE_PROTO_JAVA_OUTPUT_DIR)
-$(hide) $(PROTOC) \
-        $(PRIVATE_PROTO_JAVA_OUTPUT_OPTION)="$(PRIVATE_PROTO_JAVA_OUTPUT_PARAMS):$(PRIVATE_PROTO_JAVA_OUTPUT_DIR)" \
-        $(PRIVATE_PROTOC_FLAGS) \
+$(hide) for f in $(PRIVATE_PROTO_SRC_FILES); do \
+        $(PROTOC) \
         $(addprefix --proto_path=, $(PRIVATE_PROTO_INCLUDES)) \
-        $(PRIVATE_PROTO_SRC_FILES)
+        $(PRIVATE_PROTO_JAVA_OUTPUT_OPTION)=$(PRIVATE_PROTO_JAVA_OUTPUT_DIR) \
+        $(PRIVATE_PROTOC_FLAGS) \
+        $$f || exit 33; \
+        done
 $(hide) touch $@
 endef