From 24c7289d242254545785c7cab237fc369b9072f9 Mon Sep 17 00:00:00 2001
From: Ulas Kirazci <ulas@google.com>
Date: Thu, 25 Jul 2013 19:35:28 +0000
Subject: [PATCH] Revert "Allow proto builds to pass in java proto params."

This reverts commit 28b46fc16c026365378909f1cc88fad0d3b2395c.

Change-Id: Iaca9fa749c6f460911cc46e08e6b3ae2555b8bcc
---
 core/base_rules.mk  |  1 -
 core/clear_vars.mk  |  1 -
 core/definitions.mk | 10 ++++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/core/base_rules.mk b/core/base_rules.mk
index f6497dabbe..f0a6398649 100644
--- a/core/base_rules.mk
+++ b/core/base_rules.mk
@@ -264,7 +264,6 @@ $(proto_java_sources_file_stamp): PRIVATE_PROTO_JAVA_OUTPUT_OPTION := --java_out
   endif
 endif
 $(proto_java_sources_file_stamp): PRIVATE_PROTOC_FLAGS := $(LOCAL_PROTOC_FLAGS)
-$(proto_java_sources_file_stamp): PRIVATE_PROTO_JAVA_OUTPUT_PARAMS := $(LOCAL_PROTO_JAVA_OUTPUT_PARAMS)
 $(proto_java_sources_file_stamp) : $(proto_sources_fullpath) $(PROTOC)
 	$(call transform-proto-to-java)
 
diff --git a/core/clear_vars.mk b/core/clear_vars.mk
index 7ad58b2e9b..8d848140ad 100644
--- a/core/clear_vars.mk
+++ b/core/clear_vars.mk
@@ -120,7 +120,6 @@ LOCAL_BUILD_HOST_DEX:=
 LOCAL_DEX_PREOPT:= # '',true,false,nostripping
 LOCAL_PROTOC_OPTIMIZE_TYPE:= # lite(default),micro,nano,full
 LOCAL_PROTOC_FLAGS:=
-LOCAL_PROTO_JAVA_OUTPUT_PARAMS:=
 LOCAL_NO_CRT:=
 LOCAL_PROPRIETARY_MODULE:=
 LOCAL_MODULE_OWNER:=
diff --git a/core/definitions.mk b/core/definitions.mk
index 4da78de152..7834baa4d0 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -889,11 +889,13 @@ define transform-proto-to-java
 @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