diff options
| author | Ulas Kirazci <ulas@google.com> | 2013-07-25 20:31:44 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-07-25 20:31:48 +0000 |
| commit | 5094e33bddc5bb7ba8c63b725078764450b16973 (patch) | |
| tree | 984f138cf21e51fd6f8f8a47b01509bb0729c7b6 /core/base_rules.mk | |
| parent | be5813170364c382ca2fbc6500d567065449473e (diff) | |
| parent | 24c7289d242254545785c7cab237fc369b9072f9 (diff) | |
| download | build-5094e33bddc5bb7ba8c63b725078764450b16973.zip build-5094e33bddc5bb7ba8c63b725078764450b16973.tar.gz build-5094e33bddc5bb7ba8c63b725078764450b16973.tar.bz2 | |
Merge "Revert "Allow proto builds to pass in java proto params.""
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 f6497da..f0a6398 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) |