third_party/protobuf: Update to HEAD (83d681ee2c)

third_party/protobuf/src/google/protobuf/compiler/java/java_options.h

Index: third_party/protobuf/src/google/protobuf/compiler/java/java_options.h
diff --git a/third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_options.h b/third_party/protobuf/src/google/protobuf/compiler/java/java_options.h
similarity index 65%
copy from third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_options.h
copy to third_party/protobuf/src/google/protobuf/compiler/java/java_options.h
index ab1d2ed38a8cae99ac01a7ddd8ae1285da27f36e..7bce14470d671d614fdab362f17038a49cc45a2a 100644
--- a/third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_options.h
+++ b/third_party/protobuf/src/google/protobuf/compiler/java/java_options.h
@@ -28,40 +28,46 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-// Author: rennie@google.com (Jeffrey Rennie)
-
-#ifndef GOOGLE_PROTOBUF_COMPILER_CPP_OPTIONS_H__
-#define GOOGLE_PROTOBUF_COMPILER_CPP_OPTIONS_H__
+#ifndef GOOGLE_PROTOBUF_COMPILER_JAVA_OPTIONS_H__
+#define GOOGLE_PROTOBUF_COMPILER_JAVA_OPTIONS_H__
 
 #include <string>
 
-#include <google/protobuf/stubs/common.h>
 namespace google {
 namespace protobuf {
 namespace compiler {
-namespace cpp {
+namespace java {
 
-// Generator options (see generator.cc for a description of each):
+// Generator options
 struct Options {
   Options()
-      : safe_boundary_check(false),
-        proto_h(false),
-        annotate_headers(false),
-        enforce_lite(false) {}
+      : generate_immutable_code(false),
+        generate_mutable_code(false),
+        generate_shared_code(false),
+        enforce_lite(false),
+        annotate_code(false) {
+  }
 
-  string dllexport_decl;
-  bool safe_boundary_check;
-  bool proto_h;
-  bool annotate_headers;
+  bool generate_immutable_code;
+  bool generate_mutable_code;
+  bool generate_shared_code;
+  // When set, the protoc will generate the current files and all the transitive
+  // dependencies as lite runtime.
   bool enforce_lite;
-  string annotation_pragma_name;
-  string annotation_guard_name;
+  // If true, we should build .meta files and emit @Generated annotations into
+  // generated code.
+  bool annotate_code;
+  // Name of a file where we will write a list of generated .meta file names,
+  // one per line.
+  string annotation_list_file;
+  // Name of a file where we will write a list of generated file names, one
+  // per line.
+  string output_list_file;
 };
 
-}  // namespace cpp
+}  // namespace java
 }  // namespace compiler
 }  // namespace protobuf
 
-
 }  // namespace google
-#endif  // GOOGLE_PROTOBUF_COMPILER_CPP_OPTIONS_H__
+#endif  // GOOGLE_PROTOBUF_COMPILER_JAVA_OPTIONS_H__