summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorelham@webrtc.org <elham@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>2013-05-10 17:04:59 +0000
committerelham@webrtc.org <elham@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>2013-05-10 17:04:59 +0000
commit4de065dad7914b7518ffc8c98cb59b903ce41518 (patch)
tree50651a996a412001869595bc600e5437095665a8
parent15c0af444e490e0c7471e8acc957dba33d1c6c3d (diff)
downloadwebrtc-4de065dad7914b7518ffc8c98cb59b903ce41518.tar.gz
Reverting r3978
BUG=webrtc:1749 R=niklas.enbom@webrtc.org Review URL: https://webrtc-codereview.appspot.com/1454004 git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@4000 4adac7df-926f-26a2-2b94-8c16560cd09d
-rw-r--r--build/common.gypi7
1 files changed, 4 insertions, 3 deletions
diff --git a/build/common.gypi b/build/common.gypi
index 1959b509..91d14d06 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -63,9 +63,6 @@
# which can be easily parsed for offline processing.
'enable_data_logging%': 0,
- # Enables the use of protocol buffers for debug recordings.
- 'enable_protobuf%': 1,
-
# Disable these to not build components which can be externally provided.
'build_libjpeg%': 1,
'build_libyuv%': 1,
@@ -99,6 +96,9 @@
'include_tests%': 0,
+ # Disable the use of protocol buffers in production code.
+ 'enable_protobuf%': 0,
+
'enable_tracing%': 0,
'enable_android_opensl%': 0,
@@ -107,6 +107,7 @@
'include_internal_audio_device%': 1,
'include_internal_video_capture%': 1,
'include_internal_video_render%': 1,
+ 'enable_protobuf%': 1,
'enable_tracing%': 1,
'include_tests%': 1,