diff options
| author | Daniel Erat <derat@chromium.org> | 2015-08-26 17:45:21 -0600 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2015-08-26 20:22:01 -0700 |
| commit | c3d89bb4a8d9c8622bbdbd846085c3c96643b253 (patch) | |
| tree | d581629cb1b470270ef8ff63b920e26bdc1886cd | |
| parent | d0aed8b1babb09dd08fa253590409e7a904400da (diff) | |
| download | system_api-c3d89bb4a8d9c8622bbdbd846085c3c96643b253.tar.gz | |
Add missing 'syntax = "proto2"' directives to *.proto.
Apply a patch from thakis@chromium.org to avoid warnings from the new
protobuf compiler used by Chromium.
BUG=chromium:525255
TEST=built it
Change-Id: I33cdfb2f706db921d4db84dc2176955b1435a537
Reviewed-on: https://chromium-review.googlesource.com/295731
Commit-Ready: Dan Erat <derat@chromium.org>
Tested-by: Dan Erat <derat@chromium.org>
Reviewed-by: Nico Weber <thakis@chromium.org>
| -rw-r--r-- | dbus/cryptohome/key.proto | 2 | ||||
| -rw-r--r-- | dbus/cryptohome/rpc.proto | 2 | ||||
| -rw-r--r-- | dbus/cryptohome/signed_secret.proto | 2 | ||||
| -rw-r--r-- | dbus/field_trial_list.proto | 2 | ||||
| -rw-r--r-- | dbus/mtp_file_entry.proto | 2 | ||||
| -rw-r--r-- | dbus/mtp_storage_info.proto | 2 |
6 files changed, 12 insertions, 0 deletions
diff --git a/dbus/cryptohome/key.proto b/dbus/cryptohome/key.proto index 3f51d6a..fb95b48 100644 --- a/dbus/cryptohome/key.proto +++ b/dbus/cryptohome/key.proto @@ -7,6 +7,8 @@ // // Anything in this file may be persisted on disk. Update carefully! +syntax = "proto2"; + option optimize_for = LITE_RUNTIME; package cryptohome; diff --git a/dbus/cryptohome/rpc.proto b/dbus/cryptohome/rpc.proto index d52665c..1624d14 100644 --- a/dbus/cryptohome/rpc.proto +++ b/dbus/cryptohome/rpc.proto @@ -13,6 +13,8 @@ // parameters exist, the less data is actually transferred on the wire // in "default" situations. +syntax = "proto2"; + option optimize_for = LITE_RUNTIME; package cryptohome; diff --git a/dbus/cryptohome/signed_secret.proto b/dbus/cryptohome/signed_secret.proto index 6d85c4f..16fedab 100644 --- a/dbus/cryptohome/signed_secret.proto +++ b/dbus/cryptohome/signed_secret.proto @@ -8,6 +8,8 @@ // The data in this file will be shared in Chrome, Chrome OS (cryptohome), // and on servers. Ensure all parties are aware when making changes. +syntax = "proto2"; + option optimize_for = LITE_RUNTIME; package ac.chrome.managedaccounts.account; diff --git a/dbus/field_trial_list.proto b/dbus/field_trial_list.proto index c7a9051..5558308 100644 --- a/dbus/field_trial_list.proto +++ b/dbus/field_trial_list.proto @@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +syntax = "proto2"; + option optimize_for = LITE_RUNTIME; // This protobuf is for serializing Finch experimental field trial data to diff --git a/dbus/mtp_file_entry.proto b/dbus/mtp_file_entry.proto index 5d0f454..943498b 100644 --- a/dbus/mtp_file_entry.proto +++ b/dbus/mtp_file_entry.proto @@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +syntax = "proto2"; + option optimize_for = LITE_RUNTIME; // This protobuf is for sending file entries from a mtp/ptp device to the diff --git a/dbus/mtp_storage_info.proto b/dbus/mtp_storage_info.proto index aa253bb..0551b2a 100644 --- a/dbus/mtp_storage_info.proto +++ b/dbus/mtp_storage_info.proto @@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +syntax = "proto2"; + option optimize_for = LITE_RUNTIME; // This protobuf is for sending the characteristics of a storage from a mtp/ptp |