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..3464f5310a81ac35a9636283734fa7c9c71d62bf 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': [
@@ -1301,6 +1296,15 @@
       'sources/': [
         ['exclude', '^browser/speech/'],
       ],
+    }, {  # input_speech==1
+      'conditions': [

[Torne, 2013/04/04 09:49:09]

I generally prefer not to use a nested condition for something this simple; it's
usually clearer to just have a separate 'input_speech==1 and OS!='android'" or
similar rather than nesting another condition in the else branch.

[Mostyn Bramley-Moore, 2013/04/04 10:17:17]

Done in patch set 3.

[Mostyn Bramley-Moore, 2013/04/04 10:17:39]

Done.

+        ['OS!="android"', {
+          'dependencies': [
+            '../third_party/flac/flac.gyp:libflac',
+            '../third_party/speex/speex.gyp:libspeex',
+          ],
+        }],
+      ],
     }],
     ['linux_use_libgps==1', {
       'dependencies': [