From ac2aa599abbd9bb353914648e83de934a15b3682 Mon Sep 17 00:00:00 2001 From: Luigi Semenzato Date: Fri, 31 Aug 2018 10:16:39 -0700 Subject: 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 Tested-by: Luigi Semenzato Reviewed-by: Dan Erat --- dbus/metrics_event/metrics_event.proto | 25 +++++++++++++++++++++++++ dbus/metrics_event/service.proto | 25 ------------------------- 2 files changed, 25 insertions(+), 25 deletions(-) create mode 100644 dbus/metrics_event/metrics_event.proto delete mode 100644 dbus/metrics_event/service.proto (limited to 'dbus') diff --git a/dbus/metrics_event/metrics_event.proto b/dbus/metrics_event/metrics_event.proto new file mode 100644 index 0000000..48fd473 --- /dev/null +++ b/dbus/metrics_event/metrics_event.proto @@ -0,0 +1,25 @@ +// Copyright 2018 The Chromium OS Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +syntax = "proto3"; + +option optimize_for = LITE_RUNTIME; + +package metrics_event; + +// Content of MetricsEvent signals emitted by Chrome. +message Event { + // Event types. + enum Type { + TAB_DISCARD = 0; + OOM_KILL = 1; + TAB_SWITCH = 2; + } + + // The type of the event being signaled. + Type type = 1; + + // The time of the event (CLOCK_MONOTONIC in milliseconds). + int64 timestamp = 2; +} diff --git a/dbus/metrics_event/service.proto b/dbus/metrics_event/service.proto deleted file mode 100644 index 48fd473..0000000 --- a/dbus/metrics_event/service.proto +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright 2018 The Chromium OS Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -syntax = "proto3"; - -option optimize_for = LITE_RUNTIME; - -package metrics_event; - -// Content of MetricsEvent signals emitted by Chrome. -message Event { - // Event types. - enum Type { - TAB_DISCARD = 0; - OOM_KILL = 1; - TAB_SWITCH = 2; - } - - // The type of the event being signaled. - Type type = 1; - - // The time of the event (CLOCK_MONOTONIC in milliseconds). - int64 timestamp = 2; -} -- cgit v1.2.3