summaryrefslogtreecommitdiffstats
path: root/core/base_rules.mk
diff options
context:
space:
mode:
authorUlas Kirazci <ulas@google.com>2013-07-25 12:28:19 -0700
committerUlas Kirazci <ulas@google.com>2013-07-25 13:40:53 -0700
commit6e485b545adc2476fed23eedaec8f121fad191b2 (patch)
treefc3c6cb0624f5822b2c2dccbde4d33f0032d0493 /core/base_rules.mk
parent5094e33bddc5bb7ba8c63b725078764450b16973 (diff)
downloadbuild-6e485b545adc2476fed23eedaec8f121fad191b2.zip
build-6e485b545adc2476fed23eedaec8f121fad191b2.tar.gz
build-6e485b545adc2476fed23eedaec8f121fad191b2.tar.bz2
Allow proto builds to pass in java proto params.
Change-Id: I65fe0cd96f818f59267da6159e6bd2ad28f07a11
Diffstat (limited to 'core/base_rules.mk')
-rw-r--r--core/base_rules.mk1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/base_rules.mk b/core/base_rules.mk
index f0a6398..f6497da 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)