Bug 1385461 - Document the reason for the json_escaping.h-including cc files in SOURCES.
Because a namespace is improperly closed outside of the header guard
in json_escaping.h:
https://github.com/google/protobuf/blob/b04e5cba356212e4e8c66c61bbe0c3a20537c5b9/src/google/protobuf/util/internal/json_escaping.h#L91
we can't put any of the files that include json_escaping.h in
UNIFIED_SOURCES without fixing this in the upstream source.
This should be fixed in the next upstream release:
https://github.com/google/protobuf/pull/3744
MozReview-Commit-ID: sc98xgrUfx
--- a/toolkit/components/protobuf/moz.build
+++ b/toolkit/components/protobuf/moz.build
@@ -222,18 +222,18 @@ UNIFIED_SOURCES += [
'src/google/protobuf/wrappers.pb.cc',
]
SOURCES += [
'src/google/protobuf/extension_set_heavy.cc',
'src/google/protobuf/generated_message_table_driven.cc',
'src/google/protobuf/generated_message_table_driven_lite.cc',
'src/google/protobuf/stubs/time.cc', # GetCurrentTime conflict in winbase.h
- 'src/google/protobuf/util/internal/json_escaping.cc',
- 'src/google/protobuf/util/internal/json_objectwriter.cc',
+ 'src/google/protobuf/util/internal/json_escaping.cc', # namespace problem in json_escaping.h
+ 'src/google/protobuf/util/internal/json_objectwriter.cc', # namespace problem in json_escaping.h
'src/google/protobuf/util/internal/json_stream_parser.cc',
'src/google/protobuf/util/internal/proto_writer.cc', # GetCurrentTime conflict in winbase.h
'src/google/protobuf/util/internal/protostream_objectsource.cc', # GetCurrentTime conflict in winbase.h
'src/google/protobuf/util/internal/protostream_objectwriter.cc', # GetCurrentTime conflict in winbase.h
'src/google/protobuf/util/message_differencer.cc',
'src/google/protobuf/util/time_util.cc', # GetCurrentTime conflict in winbase.h
'src/google/protobuf/wire_format.cc',
]