Merge pull request #509 from pherl/update_BUILD

Update BUILD for the recent json util change.

BUILD

@@ -29,9 +29,15 @@ cc_library(
         "src/google/protobuf/repeated_field.cc",
         "src/google/protobuf/stubs/atomicops_internals_x86_gcc.cc",
         "src/google/protobuf/stubs/atomicops_internals_x86_msvc.cc",
+        "src/google/protobuf/stubs/bytestream.cc",
         "src/google/protobuf/stubs/common.cc",
         "src/google/protobuf/stubs/once.cc",
+        "src/google/protobuf/stubs/status.cc",
+        "src/google/protobuf/stubs/statusor.cc",
+        "src/google/protobuf/stubs/stringpiece.cc",
         "src/google/protobuf/stubs/stringprintf.cc",
+        "src/google/protobuf/stubs/strutil.cc",
+        "src/google/protobuf/stubs/time.cc",
         "src/google/protobuf/wire_format_lite.cc",
     ],
     copts = COPTS,
@@ -69,13 +75,30 @@ cc_library(
         "src/google/protobuf/service.cc",
         "src/google/protobuf/source_context.pb.cc",
         "src/google/protobuf/struct.pb.cc",
+        "src/google/protobuf/stubs/mathlimits.cc",
         "src/google/protobuf/stubs/structurally_valid.cc",
-        "src/google/protobuf/stubs/strutil.cc",
         "src/google/protobuf/stubs/substitute.cc",
         "src/google/protobuf/text_format.cc",
         "src/google/protobuf/timestamp.pb.cc",
         "src/google/protobuf/type.pb.cc",
         "src/google/protobuf/unknown_field_set.cc",
+        "src/google/protobuf/util/field_comparator.cc",
+        "src/google/protobuf/util/internal/datapiece.cc",
+        "src/google/protobuf/util/internal/default_value_objectwriter.cc",
+        "src/google/protobuf/util/internal/error_listener.cc",
+        "src/google/protobuf/util/internal/field_mask_utility.cc",
+        "src/google/protobuf/util/internal/json_escaping.cc",
+        "src/google/protobuf/util/internal/json_objectwriter.cc",
+        "src/google/protobuf/util/internal/json_stream_parser.cc",
+        "src/google/protobuf/util/internal/object_writer.cc",
+        "src/google/protobuf/util/internal/protostream_objectsource.cc",
+        "src/google/protobuf/util/internal/protostream_objectwriter.cc",
+        "src/google/protobuf/util/internal/type_info.cc",
+        "src/google/protobuf/util/internal/type_info_test_helper.cc",
+        "src/google/protobuf/util/internal/utility.cc",
+        "src/google/protobuf/util/json_util.cc",
+        "src/google/protobuf/util/message_differencer.cc",
+        "src/google/protobuf/util/type_resolver_util.cc",
         "src/google/protobuf/wire_format.cc",
         "src/google/protobuf/wrappers.pb.cc",
     ],
@@ -260,6 +283,15 @@ TEST_PROTOS = [
     "google/protobuf/unittest_preserve_unknown_enum2.proto",
     "google/protobuf/unittest_proto3_arena.proto",
     "google/protobuf/unittest_well_known_types.proto",
+    "google/protobuf/util/internal/testdata/anys.proto",
+    "google/protobuf/util/internal/testdata/books.proto",
+    "google/protobuf/util/internal/testdata/default_value.proto",
+    "google/protobuf/util/internal/testdata/default_value_test.proto",
+    "google/protobuf/util/internal/testdata/field_mask.proto",
+    "google/protobuf/util/internal/testdata/maps.proto",
+    "google/protobuf/util/internal/testdata/struct.proto",
+    "google/protobuf/util/internal/testdata/timestamp_duration.proto",
+    "google/protobuf/util/json_format_proto3.proto",
 ]
 
 TEST_PROTOS_OUTS = [
@@ -314,6 +346,24 @@ TEST_PROTOS_OUTS = [
     "src/google/protobuf/unittest_proto3_arena.pb.h",
     "src/google/protobuf/unittest_well_known_types.pb.cc",
     "src/google/protobuf/unittest_well_known_types.pb.h",
+    "src/google/protobuf/util/internal/testdata/anys.pb.cc",
+    "src/google/protobuf/util/internal/testdata/anys.pb.h",
+    "src/google/protobuf/util/internal/testdata/books.pb.cc",
+    "src/google/protobuf/util/internal/testdata/books.pb.h",
+    "src/google/protobuf/util/internal/testdata/default_value.pb.cc",
+    "src/google/protobuf/util/internal/testdata/default_value.pb.h",
+    "src/google/protobuf/util/internal/testdata/default_value_test.pb.cc",
+    "src/google/protobuf/util/internal/testdata/default_value_test.pb.h",
+    "src/google/protobuf/util/internal/testdata/field_mask.pb.cc",
+    "src/google/protobuf/util/internal/testdata/field_mask.pb.h",
+    "src/google/protobuf/util/internal/testdata/maps.pb.cc",
+    "src/google/protobuf/util/internal/testdata/maps.pb.h",
+    "src/google/protobuf/util/internal/testdata/struct.pb.cc",
+    "src/google/protobuf/util/internal/testdata/struct.pb.h",
+    "src/google/protobuf/util/internal/testdata/timestamp_duration.pb.cc",
+    "src/google/protobuf/util/internal/testdata/timestamp_duration.pb.h",
+    "src/google/protobuf/util/json_format_proto3.pb.cc",
+    "src/google/protobuf/util/json_format_proto3.pb.h",
 ]
 
 PROTOS = LITE_TEST_PROTOS + TEST_PROTOS
@@ -346,7 +396,6 @@ COMMON_TEST_SRCS = [
 # cc_test(
 #     name = "protobuf_test",
 #     srcs = OUTPUTS + COMMON_TEST_SRCS + [
-#         # AUTOGEN(test_srcs)
 #         "src/google/protobuf/any_test.cc",
 #         "src/google/protobuf/arena_unittest.cc",
 #         "src/google/protobuf/arenastring_unittest.cc",
@@ -382,15 +431,29 @@ COMMON_TEST_SRCS = [
 #         "src/google/protobuf/reflection_ops_unittest.cc",
 #         "src/google/protobuf/repeated_field_reflection_unittest.cc",
 #         "src/google/protobuf/repeated_field_unittest.cc",
+#         "src/google/protobuf/stubs/bytestream_unittest.cc",
 #         "src/google/protobuf/stubs/common_unittest.cc",
 #         "src/google/protobuf/stubs/once_unittest.cc",
+#         "src/google/protobuf/stubs/status_test.cc",
+#         "src/google/protobuf/stubs/statusor_test.cc",
+#         "src/google/protobuf/stubs/stringpiece_unittest.cc",
 #         "src/google/protobuf/stubs/stringprintf_unittest.cc",
 #         "src/google/protobuf/stubs/structurally_valid_unittest.cc",
 #         "src/google/protobuf/stubs/strutil_unittest.cc",
 #         "src/google/protobuf/stubs/template_util_unittest.cc",
+#         "src/google/protobuf/stubs/time_test.cc",
 #         "src/google/protobuf/stubs/type_traits_unittest.cc",
 #         "src/google/protobuf/text_format_unittest.cc",
 #         "src/google/protobuf/unknown_field_set_unittest.cc",
+#         "src/google/protobuf/util/field_comparator_test.cc",
+#         "src/google/protobuf/util/internal/default_value_objectwriter_test.cc",
+#         "src/google/protobuf/util/internal/json_objectwriter_test.cc",
+#         "src/google/protobuf/util/internal/json_stream_parser_test.cc",
+#         "src/google/protobuf/util/internal/protostream_objectsource_test.cc",
+#         "src/google/protobuf/util/internal/protostream_objectwriter_test.cc",
+#         "src/google/protobuf/util/internal/type_info_test_helper.cc",
+#         "src/google/protobuf/util/json_util_test.cc",
+#         "src/google/protobuf/util/type_resolver_util_test.cc",
 #         "src/google/protobuf/well_known_types_unittest.cc",
 #         "src/google/protobuf/wire_format_unittest.cc",
 #     ],