Generate the new go_package options for the WKTs.
This is getting upstreamed; for now, do it locally
to ease construction.
diff --git a/ptypes/any/any.pb.go b/ptypes/any/any.pb.go
index c809f44..a26093f 100644
--- a/ptypes/any/any.pb.go
+++ b/ptypes/any/any.pb.go
@@ -103,9 +103,9 @@
0x95, 0x92, 0x19, 0x17, 0xb3, 0x63, 0x5e, 0xa5, 0x90, 0x24, 0x17, 0x07, 0x48, 0x79, 0x7c, 0x69,
0x51, 0x8e, 0x04, 0xa3, 0x02, 0xa3, 0x06, 0x67, 0x10, 0x3b, 0x88, 0x1f, 0x5a, 0x94, 0x23, 0x24,
0xc2, 0xc5, 0x5a, 0x96, 0x98, 0x53, 0x9a, 0x2a, 0xc1, 0x04, 0x14, 0xe7, 0x09, 0x82, 0x70, 0x9c,
- 0x02, 0xb8, 0x84, 0x81, 0x96, 0xea, 0xa1, 0x19, 0xe7, 0xc4, 0x01, 0x34, 0x2c, 0x00, 0xc4, 0x09,
- 0x60, 0x8c, 0x62, 0x06, 0x5a, 0xbb, 0x80, 0x91, 0x71, 0x11, 0x13, 0xb3, 0x7b, 0x80, 0xd3, 0x2a,
- 0x26, 0x39, 0x77, 0x88, 0xda, 0x00, 0xa8, 0x5a, 0xbd, 0xf0, 0xd4, 0x9c, 0x1c, 0xef, 0xbc, 0xfc,
- 0xf2, 0xbc, 0x10, 0x90, 0x43, 0x93, 0xd8, 0xc0, 0x86, 0x18, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff,
- 0x5c, 0xa1, 0xa0, 0xf2, 0xd4, 0x00, 0x00, 0x00,
+ 0x8a, 0xb8, 0x84, 0x81, 0x96, 0xea, 0xa1, 0x19, 0xe7, 0xc4, 0x01, 0x34, 0x2c, 0x00, 0xc4, 0x09,
+ 0x60, 0x8c, 0x52, 0x25, 0xca, 0x71, 0x0b, 0x18, 0x19, 0x17, 0x31, 0x31, 0xbb, 0x07, 0x38, 0xad,
+ 0x62, 0x92, 0x73, 0x87, 0x98, 0x16, 0x00, 0x55, 0xa5, 0x17, 0x9e, 0x9a, 0x93, 0xe3, 0x9d, 0x97,
+ 0x5f, 0x9e, 0x17, 0x02, 0x52, 0x9d, 0xc4, 0x06, 0xd6, 0x6e, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff,
+ 0xc6, 0x4d, 0x03, 0x23, 0xf6, 0x00, 0x00, 0x00,
}
diff --git a/ptypes/any/any.proto b/ptypes/any/any.proto
index 7689d50..9b90756 100644
--- a/ptypes/any/any.proto
+++ b/ptypes/any/any.proto
@@ -31,7 +31,7 @@
syntax = "proto3";
package google.protobuf;
-option go_package = "any";
+option go_package = "github.com/golang/protobuf/ptypes/any";
option csharp_namespace = "Google.Protobuf.WellKnownTypes";
option java_package = "com.google.protobuf";
diff --git a/ptypes/duration/duration.pb.go b/ptypes/duration/duration.pb.go
index 2d0a6b7..593c02a 100644
--- a/ptypes/duration/duration.pb.go
+++ b/ptypes/duration/duration.pb.go
@@ -99,9 +99,9 @@
0xd3, 0x73, 0x52, 0xf5, 0x60, 0xea, 0x95, 0xac, 0xb8, 0x38, 0x5c, 0xa0, 0x4a, 0x84, 0x24, 0xb8,
0xd8, 0x8b, 0x53, 0x93, 0xf3, 0xf3, 0x52, 0x8a, 0x25, 0x18, 0x15, 0x18, 0x35, 0x98, 0x83, 0x60,
0x5c, 0x21, 0x11, 0x2e, 0xd6, 0xbc, 0xc4, 0xbc, 0xfc, 0x62, 0x09, 0x26, 0xa0, 0x38, 0x6b, 0x10,
- 0x84, 0xe3, 0x14, 0xc5, 0x25, 0x0c, 0x74, 0x82, 0x1e, 0x9a, 0x91, 0x4e, 0xbc, 0x30, 0x03, 0x03,
- 0x40, 0x22, 0x01, 0x8c, 0x51, 0x1c, 0x30, 0x47, 0x2c, 0x60, 0x64, 0x5c, 0xc4, 0xc4, 0xec, 0x1e,
- 0xe0, 0xb4, 0x8a, 0x49, 0xce, 0x1d, 0xa2, 0x2b, 0x00, 0xaa, 0x4b, 0x2f, 0x3c, 0x35, 0x27, 0xc7,
- 0x3b, 0x2f, 0xbf, 0x3c, 0x2f, 0x04, 0xe4, 0x81, 0x24, 0x36, 0xb0, 0x71, 0xc6, 0x80, 0x00, 0x00,
- 0x00, 0xff, 0xff, 0xa2, 0x2c, 0xaf, 0x9f, 0xec, 0x00, 0x00, 0x00,
+ 0x84, 0xe3, 0x54, 0xc3, 0x25, 0x0c, 0x74, 0x82, 0x1e, 0x9a, 0x91, 0x4e, 0xbc, 0x30, 0x03, 0x03,
+ 0x40, 0x22, 0x01, 0x8c, 0x51, 0x5a, 0xc4, 0xbb, 0x77, 0x01, 0x23, 0xe3, 0x22, 0x26, 0x66, 0xf7,
+ 0x00, 0xa7, 0x55, 0x4c, 0x72, 0xee, 0x10, 0x73, 0x03, 0xa0, 0x4a, 0xf5, 0xc2, 0x53, 0x73, 0x72,
+ 0xbc, 0xf3, 0xf2, 0xcb, 0xf3, 0x42, 0x40, 0x5a, 0x92, 0xd8, 0xc0, 0x66, 0x18, 0x03, 0x02, 0x00,
+ 0x00, 0xff, 0xff, 0x62, 0xfb, 0xb1, 0x51, 0x0e, 0x01, 0x00, 0x00,
}
diff --git a/ptypes/duration/duration.proto b/ptypes/duration/duration.proto
index d2fbc88..9be52f6 100644
--- a/ptypes/duration/duration.proto
+++ b/ptypes/duration/duration.proto
@@ -31,7 +31,7 @@
syntax = "proto3";
package google.protobuf;
-option go_package = "duration";
+option go_package = "github.com/golang/protobuf/ptypes/duration";
option csharp_namespace = "Google.Protobuf.WellKnownTypes";
option java_package = "com.google.protobuf";
diff --git a/ptypes/empty/empty.pb.go b/ptypes/empty/empty.pb.go
index 5af4b19..bac5e38 100644
--- a/ptypes/empty/empty.pb.go
+++ b/ptypes/empty/empty.pb.go
@@ -54,10 +54,10 @@
0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xcf, 0xcf, 0x49, 0xcc, 0x4b, 0xd7, 0x2f, 0x28,
0xca, 0x2f, 0xc9, 0x4f, 0x2a, 0x4d, 0xd3, 0x2f, 0x28, 0xa9, 0x2c, 0x48, 0x2d, 0xd6, 0x4f, 0xcd,
0x05, 0x32, 0x20, 0xa4, 0x1e, 0x58, 0x4e, 0x88, 0x3f, 0x3d, 0x3f, 0x3f, 0x3d, 0x27, 0x55, 0x0f,
- 0xa6, 0x52, 0x89, 0x9d, 0x8b, 0xd5, 0x15, 0x24, 0xef, 0x14, 0xce, 0x25, 0x0c, 0x34, 0x49, 0x0f,
- 0x4d, 0xde, 0x89, 0x0b, 0x2c, 0x1b, 0x00, 0xe2, 0x06, 0x30, 0x46, 0xb1, 0x82, 0xcd, 0x5a, 0xc0,
- 0xc8, 0xf8, 0x83, 0x91, 0x71, 0x11, 0x13, 0xb3, 0x7b, 0x80, 0xd3, 0x2a, 0x26, 0x39, 0x77, 0x88,
- 0x96, 0x00, 0xa8, 0x16, 0xbd, 0xf0, 0xd4, 0x9c, 0x1c, 0xef, 0xbc, 0xfc, 0xf2, 0xbc, 0x10, 0x90,
- 0x23, 0x92, 0xd8, 0xc0, 0x66, 0x19, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0x64, 0x1d, 0x6e, 0x09,
- 0xb0, 0x00, 0x00, 0x00,
+ 0xa6, 0x52, 0x89, 0x9d, 0x8b, 0xd5, 0x15, 0x24, 0xef, 0x54, 0xc9, 0x25, 0x0c, 0x34, 0x49, 0x0f,
+ 0x4d, 0xde, 0x89, 0x0b, 0x2c, 0x1b, 0x00, 0xe2, 0x06, 0x30, 0x46, 0xa9, 0x13, 0x69, 0xe7, 0x02,
+ 0x46, 0xc6, 0x1f, 0x8c, 0x8c, 0x8b, 0x98, 0x98, 0xdd, 0x03, 0x9c, 0x56, 0x31, 0xc9, 0xb9, 0x43,
+ 0x0c, 0x0d, 0x80, 0x2a, 0xd5, 0x0b, 0x4f, 0xcd, 0xc9, 0xf1, 0xce, 0xcb, 0x2f, 0xcf, 0x0b, 0x01,
+ 0x69, 0x49, 0x62, 0x03, 0x9b, 0x61, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0x7f, 0xbb, 0xf4, 0x0e,
+ 0xd2, 0x00, 0x00, 0x00,
}
diff --git a/ptypes/empty/empty.proto b/ptypes/empty/empty.proto
index 106af23..0c0d262 100644
--- a/ptypes/empty/empty.proto
+++ b/ptypes/empty/empty.proto
@@ -31,7 +31,7 @@
syntax = "proto3";
package google.protobuf;
-option go_package = "empty";
+option go_package = "github.com/golang/protobuf/ptypes/empty";
option csharp_namespace = "Google.Protobuf.WellKnownTypes";
option java_package = "com.google.protobuf";
diff --git a/ptypes/regen.sh b/ptypes/regen.sh
index c93ecb5..48e7cff 100755
--- a/ptypes/regen.sh
+++ b/ptypes/regen.sh
@@ -57,10 +57,10 @@
shortname=$(basename $f | sed 's,\.proto$,,')
cat $tmpdir/$UPSTREAM_SUBDIR/$up |
# Adjust proto package.
- # TODO(dsymonds): Upstream the go_package option instead.
- sed '/^package /a option go_package = "'${shortname}'";' |
- # Unfortunately "package struct" doesn't work.
- sed '/option go_package/s,"struct","structpb",' |
+ # TODO(dsymonds): Remove when the right go_package options are upstream.
+ sed '/^package /a option go_package = "github.com\/golang\/protobuf\/ptypes\/'${shortname}'";' |
+ # Unfortunately "package struct" and "package type" don't work.
+ sed '/option go_package/s,struct",struct;structpb",' |
cat > $PKG/$f
done
diff --git a/ptypes/struct/struct.pb.go b/ptypes/struct/struct.pb.go
index 1de4941..f3d0a4a 100644
--- a/ptypes/struct/struct.pb.go
+++ b/ptypes/struct/struct.pb.go
@@ -346,31 +346,31 @@
}
var fileDescriptor0 = []byte{
- // 406 bytes of a gzipped FileDescriptorProto
- 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x74, 0x92, 0x4f, 0x8b, 0xd3, 0x40,
- 0x18, 0xc6, 0x3b, 0x49, 0x1b, 0x9a, 0x37, 0x52, 0x4b, 0x04, 0x2d, 0x15, 0x54, 0xda, 0x4b, 0x11,
- 0x49, 0xa0, 0x22, 0x88, 0xf5, 0x62, 0xa0, 0x56, 0x30, 0x94, 0x18, 0x6d, 0x15, 0x2f, 0xa5, 0x69,
- 0xd3, 0x18, 0x3a, 0x9d, 0x09, 0xf9, 0xa3, 0xf4, 0x9b, 0x78, 0x5c, 0xf6, 0xb8, 0xc7, 0xfd, 0x84,
- 0x3b, 0x7f, 0x92, 0xec, 0xd2, 0xd2, 0x53, 0x66, 0x9e, 0xf9, 0xbd, 0xcf, 0xbc, 0xcf, 0x9b, 0x81,
- 0x77, 0x51, 0x9c, 0xff, 0x29, 0x02, 0x6b, 0x43, 0x0f, 0x76, 0x44, 0xf1, 0x9a, 0x44, 0x76, 0x92,
- 0xd2, 0x9c, 0x06, 0xc5, 0xce, 0x4e, 0xf2, 0x63, 0x12, 0x66, 0x76, 0x96, 0xa7, 0xc5, 0x26, 0x2f,
- 0x3f, 0x96, 0x38, 0x35, 0x1f, 0x47, 0x94, 0x46, 0x38, 0xb4, 0x2a, 0x76, 0xf0, 0x1f, 0x81, 0xf6,
- 0x5d, 0x10, 0xe6, 0x04, 0xb4, 0x5d, 0x1c, 0xe2, 0x6d, 0xd6, 0x43, 0xaf, 0xd4, 0x91, 0x31, 0x1e,
- 0x5a, 0x27, 0xb0, 0x25, 0x41, 0xeb, 0xb3, 0xa0, 0xa6, 0x24, 0x4f, 0x8f, 0x7e, 0x59, 0xd2, 0xff,
- 0x06, 0xc6, 0x03, 0xd9, 0xec, 0x82, 0xba, 0x0f, 0x8f, 0xcc, 0x08, 0x8d, 0x74, 0x9f, 0x2f, 0xcd,
- 0x37, 0xd0, 0xfa, 0xbb, 0xc6, 0x45, 0xd8, 0x53, 0x98, 0x66, 0x8c, 0x9f, 0x9e, 0x99, 0x2f, 0xf9,
- 0xa9, 0x2f, 0xa1, 0x0f, 0xca, 0x7b, 0x34, 0xb8, 0x55, 0xa0, 0x25, 0x44, 0xd6, 0x19, 0x90, 0x02,
- 0xe3, 0x95, 0x34, 0xe0, 0xa6, 0x9d, 0x71, 0xff, 0xcc, 0x60, 0xce, 0x10, 0xc1, 0x7f, 0x69, 0xf8,
- 0x3a, 0xa9, 0x36, 0xe6, 0x10, 0x1e, 0x91, 0xe2, 0x10, 0x84, 0xe9, 0xea, 0xfe, 0x7e, 0xc4, 0x10,
- 0x43, 0xaa, 0x35, 0xc4, 0xe6, 0x14, 0x93, 0xa8, 0x84, 0x54, 0xde, 0x38, 0x87, 0xa4, 0x2a, 0xa1,
- 0x97, 0x00, 0x01, 0xa5, 0x55, 0x1b, 0x4d, 0x86, 0xb4, 0xf9, 0x55, 0x5c, 0x93, 0xc0, 0x47, 0xe1,
- 0xc2, 0x46, 0x54, 0x22, 0x2d, 0x11, 0xf5, 0xd9, 0x85, 0x39, 0x96, 0xf6, 0x6c, 0x55, 0xa7, 0xc4,
- 0x71, 0x56, 0xd5, 0x6a, 0xa2, 0xf6, 0x3c, 0xa5, 0xcb, 0x90, 0x3a, 0x25, 0xae, 0x36, 0x8e, 0x06,
- 0xcd, 0x7d, 0x4c, 0xb6, 0x83, 0x09, 0xe8, 0x35, 0x61, 0x5a, 0xa0, 0x09, 0xb3, 0xea, 0x8f, 0x5e,
- 0x1a, 0x7a, 0x49, 0xbd, 0x7e, 0x0e, 0x7a, 0x3d, 0x44, 0xb3, 0x03, 0x30, 0x5f, 0xb8, 0xee, 0x6a,
- 0xf9, 0xc9, 0x5d, 0x4c, 0xbb, 0x0d, 0xe7, 0x17, 0x3c, 0x61, 0x8f, 0xed, 0xd4, 0xc1, 0x31, 0x64,
- 0x18, 0x8f, 0xef, 0x3d, 0xf4, 0xbb, 0x2d, 0x13, 0x25, 0xc1, 0x15, 0x42, 0xd7, 0x8a, 0x3a, 0xf3,
- 0x9c, 0x1b, 0xe5, 0xc5, 0x4c, 0xd6, 0x78, 0xd5, 0xad, 0x3f, 0x43, 0x8c, 0xbf, 0x12, 0xfa, 0x8f,
- 0xfc, 0xe0, 0x0f, 0x35, 0xd0, 0x84, 0xd9, 0xdb, 0xbb, 0x00, 0x00, 0x00, 0xff, 0xff, 0xb1, 0x28,
- 0x9b, 0x97, 0xd4, 0x02, 0x00, 0x00,
+ // 412 bytes of a gzipped FileDescriptorProto
+ 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x8c, 0x92, 0xcf, 0x8b, 0xd3, 0x40,
+ 0x14, 0xc7, 0x3b, 0x49, 0x1b, 0xcc, 0x8b, 0xd4, 0x12, 0x41, 0x4b, 0x05, 0x95, 0xf6, 0x52, 0x44,
+ 0x12, 0xac, 0x08, 0x62, 0xbd, 0x18, 0xa8, 0x15, 0x0c, 0x25, 0x46, 0x5b, 0xc1, 0x4b, 0x69, 0xda,
+ 0x34, 0x86, 0x4e, 0x67, 0x42, 0x7e, 0x28, 0x3d, 0xfa, 0x5f, 0x78, 0x5c, 0xf6, 0xb8, 0xc7, 0xfd,
+ 0x0b, 0x77, 0x7e, 0x24, 0xd9, 0xa5, 0xa5, 0xb0, 0xa7, 0x99, 0xf7, 0x9d, 0xcf, 0xfb, 0xce, 0x7b,
+ 0x6f, 0x06, 0xde, 0x45, 0x71, 0xfe, 0xbb, 0x08, 0xac, 0x35, 0xdd, 0xdb, 0x11, 0xc5, 0x2b, 0x12,
+ 0xd9, 0x49, 0x4a, 0x73, 0x1a, 0x14, 0x5b, 0x3b, 0xc9, 0x0f, 0x49, 0x98, 0xd9, 0x59, 0x9e, 0x16,
+ 0xeb, 0xbc, 0x5c, 0x2c, 0x71, 0x6a, 0x3e, 0x8a, 0x28, 0x8d, 0x70, 0x68, 0x55, 0x6c, 0xff, 0x3f,
+ 0x02, 0xed, 0xbb, 0x20, 0xcc, 0x31, 0x68, 0xdb, 0x38, 0xc4, 0x9b, 0xac, 0x8b, 0x5e, 0xaa, 0x43,
+ 0x63, 0x34, 0xb0, 0x8e, 0x60, 0x4b, 0x82, 0xd6, 0x67, 0x41, 0x4d, 0x48, 0x9e, 0x1e, 0xfc, 0x32,
+ 0xa5, 0xf7, 0x0d, 0x8c, 0x3b, 0xb2, 0xd9, 0x01, 0x75, 0x17, 0x1e, 0x98, 0x11, 0x1a, 0xea, 0x3e,
+ 0xdf, 0x9a, 0xaf, 0xa1, 0xf5, 0x67, 0x85, 0x8b, 0xb0, 0xab, 0x30, 0xcd, 0x18, 0x3d, 0x39, 0x31,
+ 0x5f, 0xf0, 0x53, 0x5f, 0x42, 0x1f, 0x94, 0xf7, 0xa8, 0x7f, 0xad, 0x40, 0x4b, 0x88, 0xac, 0x32,
+ 0x20, 0x05, 0xc6, 0x4b, 0x69, 0xc0, 0x4d, 0xdb, 0xa3, 0xde, 0x89, 0xc1, 0x8c, 0x21, 0x82, 0xff,
+ 0xd2, 0xf0, 0x75, 0x52, 0x05, 0xe6, 0x00, 0x1e, 0x92, 0x62, 0x1f, 0x84, 0xe9, 0xf2, 0xf6, 0x7e,
+ 0xc4, 0x10, 0x43, 0xaa, 0x35, 0xc4, 0xe6, 0x14, 0x93, 0xa8, 0x84, 0x54, 0x5e, 0x38, 0x87, 0xa4,
+ 0x2a, 0xa1, 0x17, 0x00, 0x01, 0xa5, 0x55, 0x19, 0x4d, 0x86, 0x3c, 0xe0, 0x57, 0x71, 0x4d, 0x02,
+ 0x1f, 0x85, 0x0b, 0x1b, 0x51, 0x89, 0xb4, 0x44, 0xab, 0x4f, 0xcf, 0xcc, 0xb1, 0xb4, 0x67, 0xbb,
+ 0xba, 0x4b, 0x1c, 0x67, 0x55, 0xae, 0x26, 0x72, 0x4f, 0xbb, 0x74, 0x19, 0x52, 0x77, 0x89, 0xab,
+ 0xc0, 0xd1, 0xa0, 0xb9, 0x8b, 0xc9, 0xa6, 0x3f, 0x06, 0xbd, 0x26, 0x4c, 0x0b, 0x34, 0x61, 0x56,
+ 0xbd, 0xe8, 0xb9, 0xa1, 0x97, 0xd4, 0xab, 0x67, 0xa0, 0xd7, 0x43, 0x34, 0xdb, 0x00, 0xb3, 0xb9,
+ 0xeb, 0x2e, 0x17, 0x9f, 0xdc, 0xf9, 0xa4, 0xd3, 0x70, 0xfe, 0x21, 0x78, 0xcc, 0x7e, 0xdb, 0xb1,
+ 0x85, 0x63, 0xc8, 0x6e, 0x3c, 0x1e, 0x7b, 0xe8, 0xd7, 0x9b, 0xfb, 0x7e, 0xcc, 0xb1, 0x5c, 0x92,
+ 0xe0, 0x02, 0xa1, 0x4b, 0x45, 0x9d, 0x7a, 0xce, 0x95, 0xf2, 0x7c, 0x2a, 0xcd, 0xbd, 0xaa, 0xbe,
+ 0x9f, 0x21, 0xc6, 0x5f, 0x09, 0xfd, 0x4b, 0x7e, 0xf0, 0xcc, 0x40, 0x13, 0x56, 0x6f, 0x6f, 0x02,
+ 0x00, 0x00, 0xff, 0xff, 0xbc, 0xcf, 0x6d, 0x50, 0xfe, 0x02, 0x00, 0x00,
}
diff --git a/ptypes/struct/struct.proto b/ptypes/struct/struct.proto
index 7e68fbc..764be03 100644
--- a/ptypes/struct/struct.proto
+++ b/ptypes/struct/struct.proto
@@ -31,7 +31,7 @@
syntax = "proto3";
package google.protobuf;
-option go_package = "structpb";
+option go_package = "github.com/golang/protobuf/ptypes/struct;structpb";
option csharp_namespace = "Google.Protobuf.WellKnownTypes";
option java_package = "com.google.protobuf";
diff --git a/ptypes/timestamp/timestamp.pb.go b/ptypes/timestamp/timestamp.pb.go
index eabbb91..643a70c 100644
--- a/ptypes/timestamp/timestamp.pb.go
+++ b/ptypes/timestamp/timestamp.pb.go
@@ -104,7 +104,7 @@
}
var fileDescriptor0 = []byte{
- // 191 bytes of a gzipped FileDescriptorProto
+ // 192 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe2, 0xb2, 0x4e, 0xcf, 0x2c, 0xc9,
0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xcf, 0xcf, 0x49, 0xcc, 0x4b, 0xd7, 0x2f, 0x28,
0xca, 0x2f, 0xc9, 0x4f, 0x2a, 0x4d, 0xd3, 0x2f, 0x28, 0xa9, 0x2c, 0x48, 0x2d, 0xd6, 0x2f, 0xc9,
@@ -112,9 +112,9 @@
0xf3, 0xd3, 0x73, 0x52, 0xf5, 0x60, 0x3a, 0x94, 0xac, 0xb9, 0x38, 0x43, 0x60, 0x6a, 0x84, 0x24,
0xb8, 0xd8, 0x8b, 0x53, 0x93, 0xf3, 0xf3, 0x52, 0x8a, 0x25, 0x18, 0x15, 0x18, 0x35, 0x98, 0x83,
0x60, 0x5c, 0x21, 0x11, 0x2e, 0xd6, 0xbc, 0xc4, 0xbc, 0xfc, 0x62, 0x09, 0x26, 0xa0, 0x38, 0x6b,
- 0x10, 0x84, 0xe3, 0x14, 0xcf, 0x25, 0x0c, 0x74, 0x85, 0x1e, 0x9a, 0x99, 0x4e, 0x7c, 0x70, 0x13,
- 0x03, 0x40, 0x42, 0x01, 0x8c, 0x51, 0x9c, 0x70, 0x77, 0x2c, 0x60, 0x64, 0xfc, 0xc1, 0xc8, 0xb8,
- 0x88, 0x89, 0xd9, 0x3d, 0xc0, 0x69, 0x15, 0x93, 0x9c, 0x3b, 0x44, 0x6b, 0x00, 0x54, 0xab, 0x5e,
- 0x78, 0x6a, 0x4e, 0x8e, 0x77, 0x5e, 0x7e, 0x79, 0x5e, 0x08, 0xc8, 0x23, 0x49, 0x6c, 0x60, 0x33,
- 0x8d, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0xab, 0x67, 0x0c, 0x88, 0xf4, 0x00, 0x00, 0x00,
+ 0x10, 0x84, 0xe3, 0xd4, 0xc8, 0xc8, 0x25, 0x0c, 0x74, 0x86, 0x1e, 0x9a, 0xa1, 0x4e, 0x7c, 0x70,
+ 0x23, 0x03, 0x40, 0x42, 0x01, 0x8c, 0x51, 0xda, 0x24, 0x38, 0x7a, 0x01, 0x23, 0xe3, 0x0f, 0x46,
+ 0xc6, 0x45, 0x4c, 0xcc, 0xee, 0x01, 0x4e, 0xab, 0x98, 0xe4, 0xdc, 0x21, 0x86, 0x07, 0x40, 0x95,
+ 0xeb, 0x85, 0xa7, 0xe6, 0xe4, 0x78, 0xe7, 0xe5, 0x97, 0xe7, 0x85, 0x80, 0xb4, 0x25, 0xb1, 0x81,
+ 0xcd, 0x31, 0x06, 0x04, 0x00, 0x00, 0xff, 0xff, 0x17, 0x5f, 0xb7, 0xdc, 0x17, 0x01, 0x00, 0x00,
}
diff --git a/ptypes/timestamp/timestamp.proto b/ptypes/timestamp/timestamp.proto
index cc6dc6f..f02178e 100644
--- a/ptypes/timestamp/timestamp.proto
+++ b/ptypes/timestamp/timestamp.proto
@@ -31,7 +31,7 @@
syntax = "proto3";
package google.protobuf;
-option go_package = "timestamp";
+option go_package = "github.com/golang/protobuf/ptypes/timestamp";
option csharp_namespace = "Google.Protobuf.WellKnownTypes";
option cc_enable_arenas = true;
diff --git a/ptypes/wrappers/wrappers.pb.go b/ptypes/wrappers/wrappers.pb.go
index a0fe341..bb7caf6 100644
--- a/ptypes/wrappers/wrappers.pb.go
+++ b/ptypes/wrappers/wrappers.pb.go
@@ -185,10 +185,10 @@
0xa5, 0x88, 0x05, 0xd5, 0x20, 0x63, 0x23, 0x2c, 0x6a, 0x58, 0xd1, 0x0c, 0xc2, 0xaa, 0x88, 0x17,
0xa6, 0x48, 0x91, 0x8b, 0xd3, 0x29, 0x3f, 0x3f, 0x07, 0x8b, 0x12, 0x0e, 0x24, 0x73, 0x82, 0x4b,
0x8a, 0x32, 0xf3, 0xd2, 0xb1, 0x28, 0xe2, 0x44, 0x72, 0x90, 0x53, 0x65, 0x49, 0x6a, 0x31, 0x16,
- 0x35, 0x3c, 0x50, 0x35, 0x4e, 0xb1, 0x5c, 0xc2, 0xc0, 0xd8, 0xd0, 0x43, 0x0b, 0x5d, 0x27, 0xde,
- 0x70, 0x68, 0xf0, 0x07, 0x80, 0x44, 0x02, 0x18, 0xa3, 0x38, 0x60, 0xf1, 0xb1, 0x80, 0x91, 0xf1,
- 0x07, 0x23, 0xe3, 0x22, 0x26, 0x66, 0xf7, 0x00, 0xa7, 0x55, 0x4c, 0x72, 0xee, 0x10, 0x8d, 0x01,
- 0x50, 0x8d, 0x7a, 0xe1, 0xa9, 0x39, 0x39, 0xde, 0x79, 0xf9, 0xe5, 0x79, 0x21, 0xa0, 0xe8, 0x4c,
- 0x62, 0x03, 0x9b, 0x68, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0xa9, 0xa6, 0x85, 0xcd, 0xfa, 0x01,
+ 0x35, 0x3c, 0x50, 0x35, 0x4e, 0xf5, 0x5c, 0xc2, 0xc0, 0xd8, 0xd0, 0x43, 0x0b, 0x5d, 0x27, 0xde,
+ 0x70, 0x68, 0xf0, 0x07, 0x80, 0x44, 0x02, 0x18, 0xa3, 0xb4, 0x88, 0x8f, 0xba, 0x05, 0x8c, 0x8c,
+ 0x3f, 0x18, 0x19, 0x17, 0x31, 0x31, 0xbb, 0x07, 0x38, 0xad, 0x62, 0x92, 0x73, 0x87, 0x18, 0x1d,
+ 0x00, 0x55, 0xad, 0x17, 0x9e, 0x9a, 0x93, 0xe3, 0x9d, 0x97, 0x5f, 0x9e, 0x17, 0x02, 0xd2, 0x95,
+ 0xc4, 0x06, 0x36, 0xc6, 0x18, 0x10, 0x00, 0x00, 0xff, 0xff, 0xa9, 0xdf, 0x64, 0x4b, 0x1c, 0x02,
0x00, 0x00,
}
diff --git a/ptypes/wrappers/wrappers.proto b/ptypes/wrappers/wrappers.proto
index 3f48109..f035adc 100644
--- a/ptypes/wrappers/wrappers.proto
+++ b/ptypes/wrappers/wrappers.proto
@@ -36,7 +36,7 @@
syntax = "proto3";
package google.protobuf;
-option go_package = "wrappers";
+option go_package = "github.com/golang/protobuf/ptypes/wrappers";
option csharp_namespace = "Google.Protobuf.WellKnownTypes";
option cc_enable_arenas = true;
