commit d64a2d9941c36a7bc2a7959ea10ab8363192ac14
author Adam Cozzette <acozzette@google.com> Wed Jun 29 15:23:27 2016 -0700
committer Adam Cozzette <acozzette@google.com> Wed Jun 29 15:38:03 2016 -0700
tree 52330d146ad63d3d70f3baade00d5d1fea8f5e0c
parent c18aa7795a2e02ef700ff8b039d94ecdcc33432f

Integrated internal changes from Google

This includes all internal changes from around May 20 to now.

python/setup.py

diff --git a/python/setup.py b/python/setup.py
index 76f0cbc..524a312 100755
--- a/python/setup.py
+++ b/python/setup.py
@@ -76,6 +76,7 @@
       sys.exit(-1)
 
 def GenerateUnittestProtos():
+  generate_proto("../src/google/protobuf/any_test.proto", False)
   generate_proto("../src/google/protobuf/map_unittest.proto", False)
   generate_proto("../src/google/protobuf/unittest_arena.proto", False)
   generate_proto("../src/google/protobuf/unittest_no_arena.proto", False)
@@ -94,6 +95,7 @@
   generate_proto("google/protobuf/internal/descriptor_pool_test2.proto", False)
   generate_proto("google/protobuf/internal/factory_test1.proto", False)
   generate_proto("google/protobuf/internal/factory_test2.proto", False)
+  generate_proto("google/protobuf/internal/file_options_test.proto", False)
   generate_proto("google/protobuf/internal/import_test_package/inner.proto", False)
   generate_proto("google/protobuf/internal/import_test_package/outer.proto", False)
   generate_proto("google/protobuf/internal/missing_enum_values.proto", False)