make it possible to disable libflac and libspeex in content

content/content_browser.gypi

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'dependencies': [
     'browser/speech/proto/speech_proto.gyp:speech_proto',
     '../base/base.gyp:base_static',
     '../crypto/crypto.gyp:crypto',
     '../google_apis/google_apis.gyp:google_apis',
@@ skipping 1159 matching lines @@
         ],
       },
       'sources!': [
         'browser/geolocation/network_location_provider.cc',
         'browser/geolocation/network_location_provider.h',
         'browser/geolocation/network_location_request.cc',
         'browser/geolocation/network_location_request.h',
         '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': [
         # Build necessary Mozilla sources
         '../third_party/mozilla/ComplexTextInputPanel.h',
         '../third_party/mozilla/ComplexTextInputPanel.mm',
         '../third_party/mozilla/NSPasteboard+Utils.h',
         '../third_party/mozilla/NSPasteboard+Utils.mm',
         '../third_party/mozilla/NSString+Utils.h',
         '../third_party/mozilla/NSString+Utils.mm',
@@ skipping 100 matching lines @@
     }, {
       'sources/': [
         ['exclude', '^browser/renderer_host/java/'],
       ],
     }],
     ['input_speech==0', {
       'sources/': [
         ['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',
       ],
     }],
   ],
 }