From 6e485b545adc2476fed23eedaec8f121fad191b2 Mon Sep 17 00:00:00 2001
From: Ulas Kirazci <ulas@google.com>
Date: Thu, 25 Jul 2013 12:28:19 -0700
Subject: [PATCH] Allow proto builds to pass in java proto params.

Change-Id: I65fe0cd96f818f59267da6159e6bd2ad28f07a11
---
 core/base_rules.mk  | 1 +
 core/clear_vars.mk  | 1 +
 core/definitions.mk | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/base_rules.mk b/core/base_rules.mk
index f0a639864..f6497dabb 100644
--- a/core/base_rules.mk
+++ b/core/base_rules.mk
@@ -264,6 +264,7 @@ $(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 8d848140a..7ad58b2e9 100644
--- a/core/clear_vars.mk
+++ b/core/clear_vars.mk
@@ -120,6 +120,7 @@ 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 7834baa4d..012dc4419 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -892,7 +892,7 @@ define transform-proto-to-java
 $(hide) for f in $(PRIVATE_PROTO_SRC_FILES); do \
         $(PROTOC) \
         $(addprefix --proto_path=, $(PRIVATE_PROTO_INCLUDES)) \
-        $(PRIVATE_PROTO_JAVA_OUTPUT_OPTION)=$(PRIVATE_PROTO_JAVA_OUTPUT_DIR) \
+        $(PRIVATE_PROTO_JAVA_OUTPUT_OPTION)="$(PRIVATE_PROTO_JAVA_OUTPUT_PARAMS):$(PRIVATE_PROTO_JAVA_OUTPUT_DIR)" \
         $(PRIVATE_PROTOC_FLAGS) \
         $$f || exit 33; \
         done