make it possible to disable libflac and libspeex in content

content/content_browser.gypi

Index: content/content_browser.gypi
diff --git a/content/content_browser.gypi b/content/content_browser.gypi
index ad13958d82c11348b1735140f4f91b9c0f5e0792..392f50642f67b90930a77eae258421f294e72dcb 100644
--- a/content/content_browser.gypi
+++ b/content/content_browser.gypi
@@ -1177,11 +1177,6 @@
         'browser/tracing/tracing_ui.cc',
         'browser/tracing/tracing_ui.h',
       ],
-    }, { # OS!="android"
-      'dependencies': [
-        '../third_party/flac/flac.gyp:libflac',
-        '../third_party/speex/speex.gyp:libspeex',
-      ],
     }],
     ['OS=="mac"', {
       'sources': [
@@ -1302,6 +1297,12 @@
         ['exclude', '^browser/speech/'],
       ],
     }],
+    ['input_speech==1 and OS!="android"', {

[Paweł Hajdan Jr., 2013/04/04 18:28:36]

I think for OS==android input_speech is 0 anyway (see build/common.gypi, look
for input_speech).

Please test that, and ideally convert this to just an "else" branch of above
"if".

[Mostyn Bramley-Moore, 2013/04/04 19:21:07]

Done in patch set 5.

I don't have the android build setup available so I can't test this directly,
but I agree with your analysis of the android setup in build/common.gypi.  I
also looked through some android build logs and it doesn't appear to build
content/browser/speech/audio_encoder.cc.

+      'dependencies': [
+        '../third_party/flac/flac.gyp:libflac',
+        '../third_party/speex/speex.gyp:libspeex',
+      ],
+    }],
     ['linux_use_libgps==1', {
       'dependencies': [
         '../build/linux/system.gyp:libgps',