diff options
| author | Ulas Kirazci <ulas@google.com> | 2013-07-24 14:32:14 -0700 |
|---|---|---|
| committer | Ulas Kirazci <ulas@google.com> | 2013-07-24 18:02:57 -0700 |
| commit | 28b46fc16c026365378909f1cc88fad0d3b2395c (patch) | |
| tree | 028821dd327edcfe94cffebdc502b909123f3d03 /core/base_rules.mk | |
| parent | 8bb3306b76bf3a20fc0f0634a492c5c18550c8e3 (diff) | |
| download | build-28b46fc16c026365378909f1cc88fad0d3b2395c.zip build-28b46fc16c026365378909f1cc88fad0d3b2395c.tar.gz build-28b46fc16c026365378909f1cc88fad0d3b2395c.tar.bz2 | |
Allow proto builds to pass in java proto params.
Also source files which have dependencies need to be bundled together
(at least the way the build system is set up now). Move
--proto_path=$(TOP) to the end so that it does not take precedence
over user-supplied --proto_path flags.
Change-Id: Ia532647fe8811d39230a23ba3671685b0388cbe0
Diffstat (limited to 'core/base_rules.mk')
| -rw-r--r-- | core/base_rules.mk | 1 |
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) |