From d64a2d9941c36a7bc2a7959ea10ab8363192ac14 Mon Sep 17 00:00:00 2001 From: Adam Cozzette Date: Wed, 29 Jun 2016 15:23:27 -0700 Subject: Integrated internal changes from Google This includes all internal changes from around May 20 to now. --- python/setup.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'python/setup.py') diff --git a/python/setup.py b/python/setup.py index 76f0cbc8..524a312f 100755 --- a/python/setup.py +++ b/python/setup.py @@ -76,6 +76,7 @@ def generate_proto(source, require = True): 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 @@ def GenerateUnittestProtos(): 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) -- cgit v1.2.3