Revert "Linux: change protobuf default option to allow building"

This reverts commit baefae90f294a981c973bffbdd3eccabfe796b6a.

The change broke Chrome for Android because non-vanilla protobuf-lite
Java files were generated.

Original review:
https://codereview.chromium.org/11228038/

TBR=phajdan.jr
BUG=160256

Review URL: https://codereview.chromium.org/11359146

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@167242 0039d316-1c4b-4281-b951-d872f2087c98

24 files changed, 72 insertions, 0 deletions

diff --git a/sync/protocol/app_notification_specifics.proto b/sync/protocol/app_notification_specifics.proto
index 76a9ed0..58436c7 100644
--- a/sync/protocol/app_notification_specifics.proto
+++ b/sync/protocol/app_notification_specifics.proto
@@ -9,6 +9,9 @@
 
 syntax = "proto2";
 
+option optimize_for = LITE_RUNTIME;
+option retain_unknown_fields = true;
+
 package sync_pb;
 
 // Properties of an app notification.
diff --git a/sync/protocol/app_setting_specifics.proto b/sync/protocol/app_setting_specifics.proto
index 03877ce..d936c66 100644
--- a/sync/protocol/app_setting_specifics.proto
+++ b/sync/protocol/app_setting_specifics.proto
@@ -11,6 +11,9 @@
 
 syntax = "proto2";
 
+option optimize_for = LITE_RUNTIME;
+option retain_unknown_fields = true;
+
 package sync_pb;
 
 import "extension_setting_specifics.proto";
diff --git a/sync/protocol/app_specifics.proto b/sync/protocol/app_specifics.proto
index d4b31c2..a7f09ec 100644
--- a/sync/protocol/app_specifics.proto
+++ b/sync/protocol/app_specifics.proto
@@ -9,6 +9,9 @@
 
 syntax = "proto2";
 
+option optimize_for = LITE_RUNTIME;
+option retain_unknown_fields = true;
+
 package sync_pb;
 
 import "extension_specifics.proto";
diff --git a/sync/protocol/autofill_specifics.proto b/sync/protocol/autofill_specifics.proto
index 373beef..ac7bc51 100644
--- a/sync/protocol/autofill_specifics.proto
+++ b/sync/protocol/autofill_specifics.proto
@@ -9,6 +9,9 @@
 
 syntax = "proto2";
 
+option optimize_for = LITE_RUNTIME;
+option retain_unknown_fields = true;
+
 package sync_pb;
 
 // Properties of autofill sync objects.
diff --git a/sync/protocol/bookmark_specifics.proto b/sync/protocol/bookmark_specifics.proto
index ac26e2b..31721ab 100644
--- a/sync/protocol/bookmark_specifics.proto
+++ b/sync/protocol/bookmark_specifics.proto
@@ -9,6 +9,9 @@
 
 syntax = "proto2";
 
+option optimize_for = LITE_RUNTIME;
+option retain_unknown_fields = true;
+
 package sync_pb;
 
 // Properties of bookmark sync objects.
diff --git a/sync/protocol/client_commands.proto b/sync/protocol/client_commands.proto
index 845a865..e574255 100644
--- a/sync/protocol/client_commands.proto
+++ b/sync/protocol/client_commands.proto
@@ -9,6 +9,9 @@
 
 syntax = "proto2";
 
+option optimize_for = LITE_RUNTIME;
+option retain_unknown_fields = true;
+
 package sync_pb;
 
 message ClientCommand {
diff --git a/sync/protocol/client_debug_info.proto b/sync/protocol/client_debug_info.proto
index c9eea04..7be62d5 100644
--- a/sync/protocol/client_debug_info.proto
+++ b/sync/protocol/client_debug_info.proto
@@ -6,6 +6,9 @@
 
 syntax = "proto2";
 
+option optimize_for = LITE_RUNTIME;
+option retain_unknown_fields = true;
+
 package sync_pb;
 
 import "get_updates_caller_info.proto";
diff --git a/sync/protocol/device_info_specifics.proto b/sync/protocol/device_info_specifics.proto
index 349b8f6..67eb469 100644
--- a/sync/protocol/device_info_specifics.proto
+++ b/sync/protocol/device_info_specifics.proto
@@ -9,6 +9,9 @@
 
 syntax = "proto2";
 
+option optimize_for = LITE_RUNTIME;
+option retain_unknown_fields = true;
+
 package sync_pb;
 
 import "sync_enums.proto";
diff --git a/sync/protocol/encryption.proto b/sync/protocol/encryption.proto
index 471cf9c..202ec33 100644
--- a/sync/protocol/encryption.proto
+++ b/sync/protocol/encryption.proto
@@ -9,6 +9,9 @@
 
 syntax = "proto2";
 
+option optimize_for = LITE_RUNTIME;
+option retain_unknown_fields = true;
+
 package sync_pb;
 
 // Encrypted sync data consists of two parts: a key name and a blob. Key name is
diff --git a/sync/protocol/experiments_specifics.proto b/sync/protocol/experiments_specifics.proto
index 3c38ac5..adb40a9 100644
--- a/sync/protocol/experiments_specifics.proto
+++ b/sync/protocol/experiments_specifics.proto
@@ -6,6 +6,9 @@
 
 syntax = "proto2";
 
+option optimize_for = LITE_RUNTIME;
+option retain_unknown_fields = true;
+
 package sync_pb;
 
 // A flag to enable support for keystore encryption.
diff --git a/sync/protocol/extension_setting_specifics.proto b/sync/protocol/extension_setting_specifics.proto
index 75b914f..62947c5 100644
--- a/sync/protocol/extension_setting_specifics.proto
+++ b/sync/protocol/extension_setting_specifics.proto
@@ -9,6 +9,9 @@
 
 syntax = "proto2";
 
+option optimize_for = LITE_RUNTIME;
+option retain_unknown_fields = true;
+
 package sync_pb;
 
 // Properties of extension setting sync objects.
diff --git a/sync/protocol/extension_specifics.proto b/sync/protocol/extension_specifics.proto
index d947cc6..e3e1dfb 100644
--- a/sync/protocol/extension_specifics.proto
+++ b/sync/protocol/extension_specifics.proto
@@ -9,6 +9,9 @@
 
 syntax = "proto2";
 
+option optimize_for = LITE_RUNTIME;
+option retain_unknown_fields = true;
+
 package sync_pb;
 
 // Properties of extension sync objects.
diff --git a/sync/protocol/get_updates_caller_info.proto b/sync/protocol/get_updates_caller_info.proto
index 5cecbf5..86fe9c8 100644
--- a/sync/protocol/get_updates_caller_info.proto
+++ b/sync/protocol/get_updates_caller_info.proto
@@ -4,6 +4,9 @@
 
 syntax = "proto2";
 
+option optimize_for = LITE_RUNTIME;
+option retain_unknown_fields = true;
+
 package sync_pb;
 
 message GetUpdatesCallerInfo {
diff --git a/sync/protocol/history_delete_directive_specifics.proto b/sync/protocol/history_delete_directive_specifics.proto
index 5d2b59a..557de8d 100644
--- a/sync/protocol/history_delete_directive_specifics.proto
+++ b/sync/protocol/history_delete_directive_specifics.proto
@@ -9,6 +9,9 @@
 
 syntax = "proto2";
 
+option optimize_for = LITE_RUNTIME;
+option retain_unknown_fields = true;
+
 package sync_pb;
 
 // All timestamps below are from Sane Time (
diff --git a/sync/protocol/nigori_specifics.proto b/sync/protocol/nigori_specifics.proto
index cf9b9d0..c904783 100644
--- a/sync/protocol/nigori_specifics.proto
+++ b/sync/protocol/nigori_specifics.proto
@@ -9,6 +9,9 @@
 
 syntax = "proto2";
 
+option optimize_for = LITE_RUNTIME;
+option retain_unknown_fields = true;
+
 package sync_pb;
 
 import "encryption.proto";
diff --git a/sync/protocol/password_specifics.proto b/sync/protocol/password_specifics.proto
index 064f3e9..769914433 100644
--- a/sync/protocol/password_specifics.proto
+++ b/sync/protocol/password_specifics.proto
@@ -9,6 +9,9 @@
 
 syntax = "proto2";
 
+option optimize_for = LITE_RUNTIME;
+option retain_unknown_fields = true;
+
 package sync_pb;
 
 import "encryption.proto";
diff --git a/sync/protocol/preference_specifics.proto b/sync/protocol/preference_specifics.proto
index 433df4d..4827c5d 100644
--- a/sync/protocol/preference_specifics.proto
+++ b/sync/protocol/preference_specifics.proto
@@ -9,6 +9,9 @@
 
 syntax = "proto2";
 
+option optimize_for = LITE_RUNTIME;
+option retain_unknown_fields = true;
+
 package sync_pb;
 
 // Properties of preference sync objects.
diff --git a/sync/protocol/search_engine_specifics.proto b/sync/protocol/search_engine_specifics.proto
index 7aaf50e..200255b 100644
--- a/sync/protocol/search_engine_specifics.proto
+++ b/sync/protocol/search_engine_specifics.proto
@@ -9,6 +9,9 @@
 
 syntax = "proto2";
 
+option optimize_for = LITE_RUNTIME;
+option retain_unknown_fields = true;
+
 package sync_pb;
 
 // Properties of custom search engine sync objects.
diff --git a/sync/protocol/session_specifics.proto b/sync/protocol/session_specifics.proto
index 086026b..41a6d33 100644
--- a/sync/protocol/session_specifics.proto
+++ b/sync/protocol/session_specifics.proto
@@ -9,6 +9,9 @@
 
 syntax = "proto2";
 
+option optimize_for = LITE_RUNTIME;
+option retain_unknown_fields = true;
+
 package sync_pb;
 
 import "sync_enums.proto";
diff --git a/sync/protocol/sync.proto b/sync/protocol/sync.proto
index 9f8493f..2b564e5 100644
--- a/sync/protocol/sync.proto
+++ b/sync/protocol/sync.proto
@@ -9,6 +9,9 @@
 
 syntax = "proto2";
 
+option optimize_for = LITE_RUNTIME;
+option retain_unknown_fields = true;
+
 package sync_pb;
 
 import "app_notification_specifics.proto";
diff --git a/sync/protocol/sync_enums.proto b/sync/protocol/sync_enums.proto
index 01d117bf..30921a5 100644
--- a/sync/protocol/sync_enums.proto
+++ b/sync/protocol/sync_enums.proto
@@ -9,6 +9,9 @@
 
 syntax = "proto2";
 
+option optimize_for = LITE_RUNTIME;
+option retain_unknown_fields = true;
+
 package sync_pb;
 
 message SyncEnums {
diff --git a/sync/protocol/test.proto b/sync/protocol/test.proto
index b95dc2b..7453cee 100644
--- a/sync/protocol/test.proto
+++ b/sync/protocol/test.proto
@@ -6,6 +6,9 @@
 
 syntax = "proto2";
 
+option optimize_for = LITE_RUNTIME;
+option retain_unknown_fields = true;
+
 package sync_pb;
 
 message UnknownFieldsTestA {
diff --git a/sync/protocol/theme_specifics.proto b/sync/protocol/theme_specifics.proto
index 1569d176..f8318e8 100644
--- a/sync/protocol/theme_specifics.proto
+++ b/sync/protocol/theme_specifics.proto
@@ -9,6 +9,9 @@
 
 syntax = "proto2";
 
+option optimize_for = LITE_RUNTIME;
+option retain_unknown_fields = true;
+
 package sync_pb;
 
 // Properties of theme sync objects.
diff --git a/sync/protocol/typed_url_specifics.proto b/sync/protocol/typed_url_specifics.proto
index f1fc566..1f8a4b8 100644
--- a/sync/protocol/typed_url_specifics.proto
+++ b/sync/protocol/typed_url_specifics.proto
@@ -9,6 +9,9 @@
 
 syntax = "proto2";
 
+option optimize_for = LITE_RUNTIME;
+option retain_unknown_fields = true;
+
 package sync_pb;
 
 // Properties of typed_url sync objects - fields correspond to similarly named