Don't attempt to decode audio data for Android

Don't attempt to decode audio data for Android

As the Web Audio API won't be enabled, make sure that Android uses
an empty implementation of the DecodeAudioFileData.

BUG=
TEST=


Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=113814

[Peter Beverloo, 2011-12-07 16:49:28]

Hi Andrew, could you have a look? The implementation in audio_decode.cc
currently refers to AudioFileReader which we don't use (and relies on ffmpeg,
which we neither use). The function is used for the Web Audio API, which is
disabled on the WebKit side, but the interface itself is not conditional.

[scherkus (not reviewing), 2011-12-08 06:48:25]

http://codereview.chromium.org/8844005/diff/1/webkit/media/webkit_media.gypi
File webkit/media/webkit_media.gypi (right):

http://codereview.chromium.org/8844005/diff/1/webkit/media/webkit_media.gypi#...
webkit/media/webkit_media.gypi:51: 'audio_decoder.cc',
does this mean we build audio_decoder_android.cc on OS!=android platforms or is
there some other global rule being applied here?

[scherkus (not reviewing), 2011-12-08 06:54:42]

seeing as you're +9 hours from me, if you can figure out an optimal gyp
situation (perhaps take a look at media.gyp for reference?), LGTM away!

[Peter Beverloo, 2011-12-08 10:37:48]

On 2011/12/08 06:48:25, scherkus wrote:
> http://codereview.chromium.org/8844005/diff/1/webkit/media/webkit_media.gypi
> File webkit/media/webkit_media.gypi (right):
> 
>
http://codereview.chromium.org/8844005/diff/1/webkit/media/webkit_media.gypi#...
> webkit/media/webkit_media.gypi:51: 'audio_decoder.cc',
> does this mean we build audio_decoder_android.cc on OS!=android platforms or
is
> there some other global rule being applied here?

No, as all _android.cc files will be excluded by a rule in common.gypi, as you
already suspected. The try bots should verify this, as the DecodeAudioFileData
function will otherwise be defined twice and thus throw linking errors.

Thank you!

[commit-bot: I haz the power, 2011-12-09 15:02:52]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/peter@chromium.org/8844005/1

[commit-bot: I haz the power, 2011-12-09 17:29:33]

Change committed as 113814