diff options
| author | Ben Murdoch <benm@google.com> | 2013-07-25 11:44:53 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2013-07-25 11:44:53 +0100 |
| commit | fc2bad5c36c72f8c2f0bfb869e642b85ccd1b2a1 (patch) | |
| tree | 25fb845adb1fb342ed1a1a129d189bd43837568d /core/base_rules.mk | |
| parent | dd3d8f4ca99f4c93e2b7a8d2f61d96fc7d888036 (diff) | |
| download | build-fc2bad5c36c72f8c2f0bfb869e642b85ccd1b2a1.zip build-fc2bad5c36c72f8c2f0bfb869e642b85ccd1b2a1.tar.gz build-fc2bad5c36c72f8c2f0bfb869e642b85ccd1b2a1.tar.bz2 | |
Revert "Allow proto builds to pass in java proto params."
This reverts commit 28b46fc16c026365378909f1cc88fad0d3b2395c.
Speculative fix for master builds. I cannot repro the break the bots
are seeing locally, but it seems related to building protobufs and this
CL was in the first broken build.
Diffstat (limited to 'core/base_rules.mk')
| -rw-r--r-- | core/base_rules.mk | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/core/base_rules.mk b/core/base_rules.mk index 5d27fa8..f92cf6a 100644 --- a/core/base_rules.mk +++ b/core/base_rules.mk @@ -268,7 +268,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) |