From a067c89eca763b1e0ccb8bcdba7cd291c9fada04 Mon Sep 17 00:00:00 2001 From: Alexey Polyudov Date: Sat, 4 Apr 2020 12:40:58 -0700 Subject: [PATCH] proto: delete incompatible proto options Change-Id: I57aa91e02675891015e108bf3b6a225c823bd4f4 --- proto/bootstrap_enums.proto | 4 ---- proto/connections_enums.proto | 4 ---- proto/discovery_enums.proto | 4 ---- proto/magic_pair_enums.proto | 4 ---- proto/nearby_client_enums.proto | 4 ---- proto/nearby_event_codes.proto | 4 ---- proto/setup_enums.proto | 4 ---- proto/sharing_enums.proto | 4 ---- 8 files changed, 32 deletions(-) diff --git a/proto/bootstrap_enums.proto b/proto/bootstrap_enums.proto index 9c378983..71bcfad6 100644 --- a/proto/bootstrap_enums.proto +++ b/proto/bootstrap_enums.proto @@ -2,10 +2,6 @@ syntax = "proto2"; package location.nearby.proto; -import "logs/proto/logs_annotations/logs_annotations.proto"; - -option (logs_proto.file_not_used_for_logging_except_enums) = true; -option java_api_version = 2; option java_package = "com.google.location.nearby.proto"; option java_outer_classname = "BootstrapEnums"; diff --git a/proto/connections_enums.proto b/proto/connections_enums.proto index f4eaaa2a..d32d6be2 100644 --- a/proto/connections_enums.proto +++ b/proto/connections_enums.proto @@ -2,10 +2,6 @@ syntax = "proto2"; package location.nearby.proto.connections; -import "logs/proto/logs_annotations/logs_annotations.proto"; - -option (logs_proto.file_not_used_for_logging_except_enums) = true; -option java_api_version = 2; option java_package = "com.google.location.nearby.proto"; option java_outer_classname = "ConnectionsEnums"; option objc_class_prefix = "GNCP"; diff --git a/proto/discovery_enums.proto b/proto/discovery_enums.proto index 71492b95..b9d6d3e7 100644 --- a/proto/discovery_enums.proto +++ b/proto/discovery_enums.proto @@ -2,10 +2,6 @@ syntax = "proto2"; package location.nearby.proto; -import "logs/proto/logs_annotations/logs_annotations.proto"; - -option (logs_proto.file_not_used_for_logging_except_enums) = true; -option java_api_version = 2; option java_package = "com.google.location.nearby.proto"; option java_outer_classname = "DiscoveryEnums"; diff --git a/proto/magic_pair_enums.proto b/proto/magic_pair_enums.proto index 51eef973..275be438 100644 --- a/proto/magic_pair_enums.proto +++ b/proto/magic_pair_enums.proto @@ -2,10 +2,6 @@ syntax = "proto2"; package location.nearby.proto; -import "logs/proto/logs_annotations/logs_annotations.proto"; - -option (logs_proto.file_not_used_for_logging_except_enums) = true; -option java_api_version = 2; option java_package = "com.google.location.nearby.proto"; option java_outer_classname = "MagicPairEnums"; option objc_class_prefix = "GNCP"; diff --git a/proto/nearby_client_enums.proto b/proto/nearby_client_enums.proto index 59dc9116..38ce9ba6 100644 --- a/proto/nearby_client_enums.proto +++ b/proto/nearby_client_enums.proto @@ -2,10 +2,6 @@ syntax = "proto2"; package location.nearby.proto; -import "logs/proto/logs_annotations/logs_annotations.proto"; - -option (logs_proto.file_not_used_for_logging_except_enums) = true; -option java_api_version = 2; option java_package = "com.google.location.nearby.proto"; option java_outer_classname = "NearbyClientEnums"; option objc_class_prefix = "GNCP"; diff --git a/proto/nearby_event_codes.proto b/proto/nearby_event_codes.proto index 91610ae5..9ee412a0 100644 --- a/proto/nearby_event_codes.proto +++ b/proto/nearby_event_codes.proto @@ -2,10 +2,6 @@ syntax = "proto2"; package location.nearby.proto; -import "logs/proto/logs_annotations/logs_annotations.proto"; - -option (logs_proto.file_not_used_for_logging_except_enums) = true; -option java_api_version = 2; option java_package = "com.google.location.nearby.proto"; option java_outer_classname = "NearbyEventCodes"; diff --git a/proto/setup_enums.proto b/proto/setup_enums.proto index 2bb334ca..79880c0f 100644 --- a/proto/setup_enums.proto +++ b/proto/setup_enums.proto @@ -2,10 +2,6 @@ syntax = "proto2"; package location.nearby.proto.setup; -import "logs/proto/logs_annotations/logs_annotations.proto"; - -option (logs_proto.file_not_used_for_logging_except_enums) = true; -option java_api_version = 2; option java_package = "com.google.location.nearby.proto"; option java_outer_classname = "SetupEnums"; option objc_class_prefix = "GNSP"; diff --git a/proto/sharing_enums.proto b/proto/sharing_enums.proto index a1df8808..725db3c5 100644 --- a/proto/sharing_enums.proto +++ b/proto/sharing_enums.proto @@ -2,10 +2,6 @@ syntax = "proto2"; package location.nearby.proto.sharing; -import "logs/proto/logs_annotations/logs_annotations.proto"; - -option (logs_proto.file_not_used_for_logging_except_enums) = true; -option java_api_version = 2; option java_package = "com.google.location.nearby.proto"; option java_outer_classname = "SharingEnums"; option objc_class_prefix = "GNSHP";