commit | ac2aa599abbd9bb353914648e83de934a15b3682 | [log] [tgz] |
---|---|---|
author | Luigi Semenzato <semenzato@chromium.org> | Fri Aug 31 17:16:39 2018 |
committer | chrome-bot <chrome-bot@chromium.org> | Sat Sep 01 21:43:34 2018 |
tree | 3412257c25124454d1224fd8c88b5ea809b45172 | |
parent | f64e5e47cf0b18553c5dee4626356c53751e90ec [diff] |
system_api: dbus: rename metrics_event proto file Naming the protobuf specification "service.proto" causes conflicts in the chrome build. This may be related to https://github.com/protocolbuffers/protobuf/issues/2520 namespace protobuf_service_2eproto { void InitDefaults() { Naming the file "service.proto" makes the namespace contain the word "service", which happens to be used by another protobuf for vm_concierge. So I get a link-time multiple definition. BUG=chromium:729335 TEST=compiles and runs correctly with chromium changes that use it Change-Id: Ic83489d3bab15f627288e44c323e5032da76d874 Reviewed-on: https://chromium-review.googlesource.com/1199965 Commit-Ready: Luigi Semenzato <semenzato@chromium.org> Tested-by: Luigi Semenzato <semenzato@chromium.org> Reviewed-by: Dan Erat <derat@chromium.org>
diff --git a/dbus/metrics_event/service.proto b/dbus/metrics_event/metrics_event.proto similarity index 100% rename from dbus/metrics_event/service.proto rename to dbus/metrics_event/metrics_event.proto