Verify build with protobuf-3.0.0, fix problems.

Also updated descriptor.proto from protobuf-3.0.0.
2014-12-22 22:52:36 +02:00
parent cfc517f36b
commit e5cbee84e1
4 changed files with 126 additions and 28 deletions
--- a/generator/proto/nanopb.proto
+++ b/generator/proto/nanopb.proto
@@ -5,6 +5,7 @@
 // These are used by nanopb to generate statically allocable structures
 // for memory-limited environments.

+syntax = "proto2";
 import "google/protobuf/descriptor.proto";

 option java_package = "fi.kapsi.koti.jpa.nanopb";