Down-integrate from google internal.
diff --git a/python/setup.py b/python/setup.py
index 8269c4a..a7bc6cd 100755
--- a/python/setup.py
+++ b/python/setup.py
@@ -88,6 +88,15 @@
generate_proto("../src/google/protobuf/unittest_mset_wire_format.proto", False)
generate_proto("../src/google/protobuf/unittest_no_generic_services.proto", False)
generate_proto("../src/google/protobuf/unittest_proto3_arena.proto", False)
+ # Move the well-known-types proto to required when they are no longer only
+ # required by json format tests.
+ generate_proto("../src/google/protobuf/timestamp.proto", False)
+ generate_proto("../src/google/protobuf/duration.proto", False)
+ generate_proto("../src/google/protobuf/wrappers.proto", False)
+ generate_proto("../src/google/protobuf/struct.proto", False)
+ generate_proto("../src/google/protobuf/any.proto", False)
+ generate_proto("../src/google/protobuf/field_mask.proto", False)
+ generate_proto("../src/google/protobuf/util/json_format_proto3.proto", False)
generate_proto("google/protobuf/internal/descriptor_pool_test1.proto", False)
generate_proto("google/protobuf/internal/descriptor_pool_test2.proto", False)
generate_proto("google/protobuf/internal/factory_test1.proto", False)