commit 09cab821a96c52b7b3482bd993177a33098012a8
author Hao Nguyen <haon@google.com> Tue Jun 11 16:00:16 2019 -0700
committer Hao Nguyen <haon@google.com> Tue Jun 11 16:00:16 2019 -0700
tree b455bea9c5e726e732856ee49d95e698ccbeb20d
parent 6153f80876b61fcd6c48a4f0c89dc51ac144a4f6

Down integrate to GitHub

python/setup.py

diff --git a/python/setup.py b/python/setup.py
index ba74443..9aabbf7 100755
--- a/python/setup.py
+++ b/python/setup.py
@@ -92,6 +92,7 @@
   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)
+  generate_proto("../src/google/protobuf/util/json_format.proto", False)
   generate_proto("../src/google/protobuf/util/json_format_proto3.proto", False)
   generate_proto("google/protobuf/internal/any_test.proto", False)
   generate_proto("google/protobuf/internal/descriptor_pool_test1.proto", False)