summaryrefslogtreecommitdiffstats
path: root/chrome/common
diff options
context:
space:
mode:
authornyquist@chromium.org <nyquist@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-12 21:36:20 +0000
committernyquist@chromium.org <nyquist@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-12 21:36:20 +0000
commit93115b583d5fa6235abe81820b0df26861196542 (patch)
treedc0be0c23cb8edfeeb81f2347cefceb4c4fe6ffa /chrome/common
parent1ba5dd614a3648feb6c23fa794dc7654a759b2b4 (diff)
downloadchromium_src-93115b583d5fa6235abe81820b0df26861196542.zip
chromium_src-93115b583d5fa6235abe81820b0df26861196542.tar.gz
chromium_src-93115b583d5fa6235abe81820b0df26861196542.tar.bz2
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
Diffstat (limited to 'chrome/common')
-rw-r--r--chrome/common/metrics/proto/chrome_experiments.proto2
-rw-r--r--chrome/common/metrics/proto/chrome_user_metrics_extension.proto2
-rw-r--r--chrome/common/metrics/proto/histogram_event.proto2
-rw-r--r--chrome/common/metrics/proto/omnibox_event.proto2
-rw-r--r--chrome/common/metrics/proto/profiler_event.proto2
-rw-r--r--chrome/common/metrics/proto/system_profile.proto2
-rw-r--r--chrome/common/metrics/proto/user_action_event.proto2
-rw-r--r--chrome/common/safe_browsing/client_model.proto2
-rw-r--r--chrome/common/safe_browsing/csd.proto2
9 files changed, 18 insertions, 0 deletions
diff --git a/chrome/common/metrics/proto/chrome_experiments.proto b/chrome/common/metrics/proto/chrome_experiments.proto
index 818df39..74d6703e 100644
--- a/chrome/common/metrics/proto/chrome_experiments.proto
+++ b/chrome/common/metrics/proto/chrome_experiments.proto
@@ -6,6 +6,8 @@
syntax = "proto2";
+option optimize_for = LITE_RUNTIME;
+
package metrics;
message ChromeVariations {
diff --git a/chrome/common/metrics/proto/chrome_user_metrics_extension.proto b/chrome/common/metrics/proto/chrome_user_metrics_extension.proto
index b24bb2d..2547cb5 100644
--- a/chrome/common/metrics/proto/chrome_user_metrics_extension.proto
+++ b/chrome/common/metrics/proto/chrome_user_metrics_extension.proto
@@ -6,6 +6,8 @@
syntax = "proto2";
+option optimize_for = LITE_RUNTIME;
+
package metrics;
import "histogram_event.proto";
diff --git a/chrome/common/metrics/proto/histogram_event.proto b/chrome/common/metrics/proto/histogram_event.proto
index 0970e24..5da6fbd 100644
--- a/chrome/common/metrics/proto/histogram_event.proto
+++ b/chrome/common/metrics/proto/histogram_event.proto
@@ -6,6 +6,8 @@
syntax = "proto2";
+option optimize_for = LITE_RUNTIME;
+
package metrics;
// Next tag: 4
diff --git a/chrome/common/metrics/proto/omnibox_event.proto b/chrome/common/metrics/proto/omnibox_event.proto
index bb12aa1..f377800 100644
--- a/chrome/common/metrics/proto/omnibox_event.proto
+++ b/chrome/common/metrics/proto/omnibox_event.proto
@@ -6,6 +6,8 @@
syntax = "proto2";
+option optimize_for = LITE_RUNTIME;
+
package metrics;
// Next tag: 13
diff --git a/chrome/common/metrics/proto/profiler_event.proto b/chrome/common/metrics/proto/profiler_event.proto
index ea18a61..c42bc5a 100644
--- a/chrome/common/metrics/proto/profiler_event.proto
+++ b/chrome/common/metrics/proto/profiler_event.proto
@@ -6,6 +6,8 @@
syntax = "proto2";
+option optimize_for = LITE_RUNTIME;
+
package metrics;
diff --git a/chrome/common/metrics/proto/system_profile.proto b/chrome/common/metrics/proto/system_profile.proto
index ff28edb..bf25865 100644
--- a/chrome/common/metrics/proto/system_profile.proto
+++ b/chrome/common/metrics/proto/system_profile.proto
@@ -7,6 +7,8 @@
syntax = "proto2";
+option optimize_for = LITE_RUNTIME;
+
package metrics;
// Next tag: 13
diff --git a/chrome/common/metrics/proto/user_action_event.proto b/chrome/common/metrics/proto/user_action_event.proto
index 9801a07..ff688b6 100644
--- a/chrome/common/metrics/proto/user_action_event.proto
+++ b/chrome/common/metrics/proto/user_action_event.proto
@@ -7,6 +7,8 @@
syntax = "proto2";
+option optimize_for = LITE_RUNTIME;
+
package metrics;
// Next tag: 3
diff --git a/chrome/common/safe_browsing/client_model.proto b/chrome/common/safe_browsing/client_model.proto
index 863f8eb..6a1a912 100644
--- a/chrome/common/safe_browsing/client_model.proto
+++ b/chrome/common/safe_browsing/client_model.proto
@@ -14,6 +14,8 @@
syntax = "proto2";
+option optimize_for = LITE_RUNTIME;
+
package safe_browsing;
// This protocol buffer represents a machine learning model that is used in
diff --git a/chrome/common/safe_browsing/csd.proto b/chrome/common/safe_browsing/csd.proto
index 14fb1a7..e139b32 100644
--- a/chrome/common/safe_browsing/csd.proto
+++ b/chrome/common/safe_browsing/csd.proto
@@ -11,6 +11,8 @@
syntax = "proto2";
+option optimize_for = LITE_RUNTIME;
+
package safe_browsing;
message ClientPhishingRequest {