From b55a12ad327bcb330fa762430bb5ad937e2da804 Mon Sep 17 00:00:00 2001 From: "andrew@webrtc.org" Date: Wed, 8 May 2013 00:03:30 +0000 Subject: [PATCH] Enable protobuf use in Chromium. We might end up reverting this, but we need to get it committed and merged to stable in order to test in a webrtc roll. TBR=niklas.enbom BUG=webrtc:830 Review URL: https://webrtc-codereview.appspot.com/1439004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@3978 4adac7df-926f-26a2-2b94-8c16560cd09d --- webrtc/build/common.gypi | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/webrtc/build/common.gypi b/webrtc/build/common.gypi index 91d14d0602..1959b50912 100644 --- a/webrtc/build/common.gypi +++ b/webrtc/build/common.gypi @@ -63,6 +63,9 @@ # 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, @@ -96,9 +99,6 @@ 'include_tests%': 0, - # Disable the use of protocol buffers in production code. - 'enable_protobuf%': 0, - 'enable_tracing%': 0, 'enable_android_opensl%': 0, @@ -107,7 +107,6 @@ 'include_internal_audio_device%': 1, 'include_internal_video_capture%': 1, 'include_internal_video_render%': 1, - 'enable_protobuf%': 1, 'enable_tracing%': 1, 'include_tests%': 1,