From 96251f2a4de4c42c1721ea0937d0cb75164d3e6d Mon Sep 17 00:00:00 2001 From: Luca Stefani Date: Fri, 1 May 2020 16:03:52 +0200 Subject: Dialer: Fix proto warning with optmize for lite * option optimize_for = LITE_RUNTIME is ignored in proto 3+ * Instead we should use the java_lite compiler via the LOCAL_PROTOC_OPTIMIZE_TYPE flag which defaults to lite in java projects Test: m Dialer, no warnings Change-Id: I552f5895bbe8192a4ae870bb48e5ef6a9e7e8c78 --- .../contacts/common/widget/select_phone_account_dialog_options.proto | 1 - .../android/dialer/blockreportspam/block_report_spam_dialog_info.proto | 1 - java/com/android/dialer/calldetails/proto/call_details_entries.proto | 1 - java/com/android/dialer/calldetails/proto/call_details_header_info.proto | 1 - java/com/android/dialer/callintent/call_initiation_type.proto | 1 - java/com/android/dialer/callintent/call_specific_app_data.proto | 1 - java/com/android/dialer/callintent/speed_dial_contact_type.proto | 1 - java/com/android/dialer/calllog/database/contract/coalesced_ids.proto | 1 - .../com/android/dialer/calllog/database/contract/number_attributes.proto | 1 - java/com/android/dialer/calllog/model/coalesced_row.proto | 1 - java/com/android/dialer/dialercontact/dialer_contact.proto | 1 - .../android/dialer/enrichedcall/historyquery/proto/history_result.proto | 1 - java/com/android/dialer/glidephotomanager/photo_info.proto | 1 - .../dialer/historyitemactions/history_item_action_module_info.proto | 1 - .../historyitemactions/history_item_bottom_sheet_header_info.proto | 1 - java/com/android/dialer/logging/contact_lookup_result.proto | 1 - java/com/android/dialer/logging/contact_source.proto | 1 - java/com/android/dialer/logging/dialer_impression.proto | 1 - java/com/android/dialer/logging/interaction_event.proto | 1 - java/com/android/dialer/logging/people_api_lookup_error.proto | 1 - java/com/android/dialer/logging/reporting_location.proto | 1 - java/com/android/dialer/logging/screen_event.proto | 1 - java/com/android/dialer/logging/ui_action.proto | 1 - java/com/android/dialer/logging/video_tech.proto | 1 - java/com/android/dialer/phonelookup/phone_lookup_info.proto | 1 - java/com/android/dialer/phonenumberproto/dialer_phone_number.proto | 1 - java/com/android/dialer/rtt/rtt_transcript.proto | 1 - java/com/android/dialer/voicemail/model/voicemail_entry.proto | 1 - java/com/android/incallui/callconfiguration/call_configuration.proto | 1 - .../android/voicemail/impl/transcribe/grpc/voicemail_transcription.proto | 1 - 30 files changed, 30 deletions(-) diff --git a/java/com/android/contacts/common/widget/select_phone_account_dialog_options.proto b/java/com/android/contacts/common/widget/select_phone_account_dialog_options.proto index cc40c64b4..f96e31f2e 100644 --- a/java/com/android/contacts/common/widget/select_phone_account_dialog_options.proto +++ b/java/com/android/contacts/common/widget/select_phone_account_dialog_options.proto @@ -16,7 +16,6 @@ syntax = "proto2"; option java_package = "com.android.contacts.common.widget"; option java_multiple_files = true; -option optimize_for = LITE_RUNTIME; package com.android.contacts.common.widget; diff --git a/java/com/android/dialer/blockreportspam/block_report_spam_dialog_info.proto b/java/com/android/dialer/blockreportspam/block_report_spam_dialog_info.proto index 70872c7e0..a9a7c2aeb 100644 --- a/java/com/android/dialer/blockreportspam/block_report_spam_dialog_info.proto +++ b/java/com/android/dialer/blockreportspam/block_report_spam_dialog_info.proto @@ -2,7 +2,6 @@ syntax = "proto2"; option java_package = "com.android.dialer.blockreportspam"; option java_multiple_files = true; -option optimize_for = LITE_RUNTIME; package com.android.dialer.blockreportspam; diff --git a/java/com/android/dialer/calldetails/proto/call_details_entries.proto b/java/com/android/dialer/calldetails/proto/call_details_entries.proto index 0f11b537e..1ab3af657 100644 --- a/java/com/android/dialer/calldetails/proto/call_details_entries.proto +++ b/java/com/android/dialer/calldetails/proto/call_details_entries.proto @@ -2,7 +2,6 @@ syntax = "proto2"; option java_package = "com.android.dialer.calldetails"; option java_multiple_files = true; -option optimize_for = LITE_RUNTIME; import "java/com/android/dialer/enrichedcall/historyquery/proto/history_result.proto"; diff --git a/java/com/android/dialer/calldetails/proto/call_details_header_info.proto b/java/com/android/dialer/calldetails/proto/call_details_header_info.proto index e2532d504..d650a406f 100644 --- a/java/com/android/dialer/calldetails/proto/call_details_header_info.proto +++ b/java/com/android/dialer/calldetails/proto/call_details_header_info.proto @@ -2,7 +2,6 @@ syntax = "proto2"; option java_package = "com.android.dialer.calldetails"; option java_multiple_files = true; -option optimize_for = LITE_RUNTIME; import "java/com/android/dialer/phonenumberproto/dialer_phone_number.proto"; diff --git a/java/com/android/dialer/callintent/call_initiation_type.proto b/java/com/android/dialer/callintent/call_initiation_type.proto index 3823e49fb..0f74f07af 100644 --- a/java/com/android/dialer/callintent/call_initiation_type.proto +++ b/java/com/android/dialer/callintent/call_initiation_type.proto @@ -2,7 +2,6 @@ syntax = "proto2"; option java_package = "com.android.dialer.callintent"; option java_multiple_files = true; -option optimize_for = LITE_RUNTIME; package com.android.dialer.callintent; diff --git a/java/com/android/dialer/callintent/call_specific_app_data.proto b/java/com/android/dialer/callintent/call_specific_app_data.proto index 065a7aba7..2ec903094 100644 --- a/java/com/android/dialer/callintent/call_specific_app_data.proto +++ b/java/com/android/dialer/callintent/call_specific_app_data.proto @@ -2,7 +2,6 @@ syntax = "proto2"; option java_package = "com.android.dialer.callintent"; option java_multiple_files = true; -option optimize_for = LITE_RUNTIME; package com.android.dialer.callintent; diff --git a/java/com/android/dialer/callintent/speed_dial_contact_type.proto b/java/com/android/dialer/callintent/speed_dial_contact_type.proto index ecb1c3f28..df14f41aa 100644 --- a/java/com/android/dialer/callintent/speed_dial_contact_type.proto +++ b/java/com/android/dialer/callintent/speed_dial_contact_type.proto @@ -2,7 +2,6 @@ syntax = "proto2"; option java_package = "com.android.dialer.callintent"; option java_multiple_files = true; -option optimize_for = LITE_RUNTIME; package com.android.dialer.callintent; diff --git a/java/com/android/dialer/calllog/database/contract/coalesced_ids.proto b/java/com/android/dialer/calllog/database/contract/coalesced_ids.proto index 059f95782..c34e01b6b 100644 --- a/java/com/android/dialer/calllog/database/contract/coalesced_ids.proto +++ b/java/com/android/dialer/calllog/database/contract/coalesced_ids.proto @@ -16,7 +16,6 @@ syntax = "proto2"; option java_package = "com.android.dialer"; option java_multiple_files = true; -option optimize_for = LITE_RUNTIME; package com.android.dialer; diff --git a/java/com/android/dialer/calllog/database/contract/number_attributes.proto b/java/com/android/dialer/calllog/database/contract/number_attributes.proto index 2c46d1b12..97d69d784 100644 --- a/java/com/android/dialer/calllog/database/contract/number_attributes.proto +++ b/java/com/android/dialer/calllog/database/contract/number_attributes.proto @@ -16,7 +16,6 @@ syntax = "proto2"; option java_package = "com.android.dialer"; option java_multiple_files = true; -option optimize_for = LITE_RUNTIME; package com.android.dialer; diff --git a/java/com/android/dialer/calllog/model/coalesced_row.proto b/java/com/android/dialer/calllog/model/coalesced_row.proto index 913f07298..cfa42c8df 100644 --- a/java/com/android/dialer/calllog/model/coalesced_row.proto +++ b/java/com/android/dialer/calllog/model/coalesced_row.proto @@ -2,7 +2,6 @@ syntax = "proto2"; option java_package = "com.android.dialer.calllog.model"; option java_multiple_files = true; -option optimize_for = LITE_RUNTIME; package com.android.dialer.calllog.model; diff --git a/java/com/android/dialer/dialercontact/dialer_contact.proto b/java/com/android/dialer/dialercontact/dialer_contact.proto index 2d1dfbd3c..fe108a0b6 100644 --- a/java/com/android/dialer/dialercontact/dialer_contact.proto +++ b/java/com/android/dialer/dialercontact/dialer_contact.proto @@ -2,7 +2,6 @@ syntax = "proto2"; option java_package = "com.android.dialer.dialercontact"; option java_multiple_files = true; -option optimize_for = LITE_RUNTIME; package com.android.dialer.dialercontact; diff --git a/java/com/android/dialer/enrichedcall/historyquery/proto/history_result.proto b/java/com/android/dialer/enrichedcall/historyquery/proto/history_result.proto index 8efb35cc1..6aed395c6 100644 --- a/java/com/android/dialer/enrichedcall/historyquery/proto/history_result.proto +++ b/java/com/android/dialer/enrichedcall/historyquery/proto/history_result.proto @@ -2,7 +2,6 @@ syntax = "proto2"; option java_package = "com.android.dialer.enrichedcall.historyquery.proto"; option java_multiple_files = true; -option optimize_for = LITE_RUNTIME; package com.android.dialer.enrichedcall.historyquery.proto; diff --git a/java/com/android/dialer/glidephotomanager/photo_info.proto b/java/com/android/dialer/glidephotomanager/photo_info.proto index 07908d807..4e18e033e 100644 --- a/java/com/android/dialer/glidephotomanager/photo_info.proto +++ b/java/com/android/dialer/glidephotomanager/photo_info.proto @@ -2,7 +2,6 @@ syntax = "proto2"; option java_package = "com.android.dialer.glidephotomanager"; option java_multiple_files = true; -option optimize_for = LITE_RUNTIME; package com.android.dialer.glidephotomanager; diff --git a/java/com/android/dialer/historyitemactions/history_item_action_module_info.proto b/java/com/android/dialer/historyitemactions/history_item_action_module_info.proto index f7022c28c..2e8d2a050 100644 --- a/java/com/android/dialer/historyitemactions/history_item_action_module_info.proto +++ b/java/com/android/dialer/historyitemactions/history_item_action_module_info.proto @@ -2,7 +2,6 @@ syntax = "proto2"; option java_package = "com.android.dialer.historyitemactions"; option java_multiple_files = true; -option optimize_for = LITE_RUNTIME; package com.android.dialer.historyitemactions; diff --git a/java/com/android/dialer/historyitemactions/history_item_bottom_sheet_header_info.proto b/java/com/android/dialer/historyitemactions/history_item_bottom_sheet_header_info.proto index 04d9f2259..c36c50f1f 100644 --- a/java/com/android/dialer/historyitemactions/history_item_bottom_sheet_header_info.proto +++ b/java/com/android/dialer/historyitemactions/history_item_bottom_sheet_header_info.proto @@ -2,7 +2,6 @@ syntax = "proto2"; option java_package = "com.android.dialer.historyitemactions"; option java_multiple_files = true; -option optimize_for = LITE_RUNTIME; package com.android.dialer.historyitemactions; diff --git a/java/com/android/dialer/logging/contact_lookup_result.proto b/java/com/android/dialer/logging/contact_lookup_result.proto index 6dda2a6d8..437215869 100644 --- a/java/com/android/dialer/logging/contact_lookup_result.proto +++ b/java/com/android/dialer/logging/contact_lookup_result.proto @@ -3,7 +3,6 @@ syntax = "proto2"; package com.android.dialer.logging; option java_package = "com.android.dialer.logging"; option java_multiple_files = true; -option optimize_for = LITE_RUNTIME; diff --git a/java/com/android/dialer/logging/contact_source.proto b/java/com/android/dialer/logging/contact_source.proto index fbff642b2..0c0199603 100644 --- a/java/com/android/dialer/logging/contact_source.proto +++ b/java/com/android/dialer/logging/contact_source.proto @@ -3,7 +3,6 @@ syntax = "proto2"; package com.android.dialer.logging; option java_package = "com.android.dialer.logging"; option java_multiple_files = true; -option optimize_for = LITE_RUNTIME; diff --git a/java/com/android/dialer/logging/dialer_impression.proto b/java/com/android/dialer/logging/dialer_impression.proto index f3173f82e..0f362d9bc 100644 --- a/java/com/android/dialer/logging/dialer_impression.proto +++ b/java/com/android/dialer/logging/dialer_impression.proto @@ -3,7 +3,6 @@ syntax = "proto2"; package com.android.dialer.logging; option java_package = "com.android.dialer.logging"; option java_multiple_files = true; -option optimize_for = LITE_RUNTIME; diff --git a/java/com/android/dialer/logging/interaction_event.proto b/java/com/android/dialer/logging/interaction_event.proto index 47ea53461..d7a09bdfb 100644 --- a/java/com/android/dialer/logging/interaction_event.proto +++ b/java/com/android/dialer/logging/interaction_event.proto @@ -3,7 +3,6 @@ syntax = "proto2"; package com.android.dialer.logging; option java_package = "com.android.dialer.logging"; option java_multiple_files = true; -option optimize_for = LITE_RUNTIME; diff --git a/java/com/android/dialer/logging/people_api_lookup_error.proto b/java/com/android/dialer/logging/people_api_lookup_error.proto index e37d10aee..450641621 100644 --- a/java/com/android/dialer/logging/people_api_lookup_error.proto +++ b/java/com/android/dialer/logging/people_api_lookup_error.proto @@ -3,7 +3,6 @@ syntax = "proto2"; package com.android.dialer.logging; option java_package = "com.android.dialer.logging"; option java_multiple_files = true; -option optimize_for = LITE_RUNTIME; diff --git a/java/com/android/dialer/logging/reporting_location.proto b/java/com/android/dialer/logging/reporting_location.proto index 1d6ba4752..d2fd6dd97 100644 --- a/java/com/android/dialer/logging/reporting_location.proto +++ b/java/com/android/dialer/logging/reporting_location.proto @@ -3,7 +3,6 @@ syntax = "proto2"; package com.android.dialer.logging; option java_package = "com.android.dialer.logging"; option java_multiple_files = true; -option optimize_for = LITE_RUNTIME; diff --git a/java/com/android/dialer/logging/screen_event.proto b/java/com/android/dialer/logging/screen_event.proto index f4d073579..8081f6e45 100644 --- a/java/com/android/dialer/logging/screen_event.proto +++ b/java/com/android/dialer/logging/screen_event.proto @@ -3,7 +3,6 @@ syntax = "proto2"; package com.android.dialer.logging; option java_package = "com.android.dialer.logging"; option java_multiple_files = true; -option optimize_for = LITE_RUNTIME; diff --git a/java/com/android/dialer/logging/ui_action.proto b/java/com/android/dialer/logging/ui_action.proto index 886fe04eb..d14bfbbc8 100644 --- a/java/com/android/dialer/logging/ui_action.proto +++ b/java/com/android/dialer/logging/ui_action.proto @@ -3,7 +3,6 @@ syntax = "proto2"; package com.android.dialer.logging; option java_package = "com.android.dialer.logging"; option java_multiple_files = true; -option optimize_for = LITE_RUNTIME; diff --git a/java/com/android/dialer/logging/video_tech.proto b/java/com/android/dialer/logging/video_tech.proto index b5cd35145..1f274be83 100644 --- a/java/com/android/dialer/logging/video_tech.proto +++ b/java/com/android/dialer/logging/video_tech.proto @@ -3,7 +3,6 @@ syntax = "proto2"; package com.android.dialer.logging; option java_package = "com.android.dialer.logging"; option java_multiple_files = true; -option optimize_for = LITE_RUNTIME; diff --git a/java/com/android/dialer/phonelookup/phone_lookup_info.proto b/java/com/android/dialer/phonelookup/phone_lookup_info.proto index f5ab5f0a9..6a97d3d41 100644 --- a/java/com/android/dialer/phonelookup/phone_lookup_info.proto +++ b/java/com/android/dialer/phonelookup/phone_lookup_info.proto @@ -2,7 +2,6 @@ syntax = "proto2"; option java_package = "com.android.dialer.phonelookup"; option java_multiple_files = true; -option optimize_for = LITE_RUNTIME; package com.android.dialer.phonelookup; diff --git a/java/com/android/dialer/phonenumberproto/dialer_phone_number.proto b/java/com/android/dialer/phonenumberproto/dialer_phone_number.proto index ad8a8f9fa..143e2c824 100644 --- a/java/com/android/dialer/phonenumberproto/dialer_phone_number.proto +++ b/java/com/android/dialer/phonenumberproto/dialer_phone_number.proto @@ -16,7 +16,6 @@ syntax = "proto2"; option java_package = "com.android.dialer"; option java_multiple_files = true; -option optimize_for = LITE_RUNTIME; package com.android.dialer; diff --git a/java/com/android/dialer/rtt/rtt_transcript.proto b/java/com/android/dialer/rtt/rtt_transcript.proto index a580b0d2f..c674ba69f 100644 --- a/java/com/android/dialer/rtt/rtt_transcript.proto +++ b/java/com/android/dialer/rtt/rtt_transcript.proto @@ -2,7 +2,6 @@ syntax = "proto2"; option java_package = "com.android.dialer.rtt"; option java_multiple_files = true; -option optimize_for = LITE_RUNTIME; package com.android.dialer.rtt; diff --git a/java/com/android/dialer/voicemail/model/voicemail_entry.proto b/java/com/android/dialer/voicemail/model/voicemail_entry.proto index c9ca35212..c954f9603 100644 --- a/java/com/android/dialer/voicemail/model/voicemail_entry.proto +++ b/java/com/android/dialer/voicemail/model/voicemail_entry.proto @@ -2,7 +2,6 @@ syntax = "proto2"; option java_package = "com.android.dialer.voicemail.model"; option java_multiple_files = true; -option optimize_for = LITE_RUNTIME; package com.android.dialer.voicemail.model; diff --git a/java/com/android/incallui/callconfiguration/call_configuration.proto b/java/com/android/incallui/callconfiguration/call_configuration.proto index 2cf3c065c..3ff3922a8 100644 --- a/java/com/android/incallui/callconfiguration/call_configuration.proto +++ b/java/com/android/incallui/callconfiguration/call_configuration.proto @@ -16,7 +16,6 @@ syntax = "proto2"; option java_package = "com.android.dialer"; option java_multiple_files = true; -option optimize_for = LITE_RUNTIME; package com.android.dialer; diff --git a/java/com/android/voicemail/impl/transcribe/grpc/voicemail_transcription.proto b/java/com/android/voicemail/impl/transcribe/grpc/voicemail_transcription.proto index 8248b02a7..117efaeb8 100644 --- a/java/com/android/voicemail/impl/transcribe/grpc/voicemail_transcription.proto +++ b/java/com/android/voicemail/impl/transcribe/grpc/voicemail_transcription.proto @@ -5,7 +5,6 @@ syntax = "proto2"; package google.internal.communications.voicemailtranscription.v1; option java_multiple_files = true; -option optimize_for = LITE_RUNTIME; option java_package = "com.google.internal.communications.voicemailtranscription.v1"; -- cgit v1.2.3