summaryrefslogtreecommitdiffstats
path: root/media/media.gyp
diff options
context:
space:
mode:
authorqinmin@chromium.org <qinmin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-06 03:09:59 +0000
committerqinmin@chromium.org <qinmin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-06 03:09:59 +0000
commit9a1af193b777f77173642a004f87f356081ee27b (patch)
tree57da3e42c1166d20503f713ca0db147df4cef938 /media/media.gyp
parent786f45318bc9beec06ce8d4442963aad9a1c3fe9 (diff)
downloadchromium_src-9a1af193b777f77173642a004f87f356081ee27b.zip
chromium_src-9a1af193b777f77173642a004f87f356081ee27b.tar.gz
chromium_src-9a1af193b777f77173642a004f87f356081ee27b.tar.bz2
Only disable webaudio if no NEON is available
The current NEON check in media_android.cc disables webrtc and <video>, which does not require NEON support. We should only disable webaudio if no NEON is available. BUG=244018 Review URL: https://chromiumcodereview.appspot.com/16399002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@204406 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/media.gyp')
-rw-r--r--media/media.gyp15
1 files changed, 1 insertions, 14 deletions
diff --git a/media/media.gyp b/media/media.gyp
index d3d7999..2b98fb1 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -589,6 +589,7 @@
'sources': [
'base/media.cc',
'base/media.h',
+ 'base/media_stub.cc',
],
'conditions': [
['android_webview_build==0', {
@@ -596,20 +597,6 @@
'media_java',
],
}],
- ['use_openmax_dl_fft==1', {
- # FFT library requires Neon support, so we enable
- # WebAudio only if Neon is detected at runtime.
- 'sources': [
- 'base/media_android.cc',
- ],
- 'includes': [
- '../build/android/cpufeatures.gypi',
- ],
- }, {
- 'sources': [
- 'base/media_stub.cc',
- ],
- }],
],
}],
# A simple WebM encoder for animated avatars on ChromeOS.