Index: media/media.gyp |
diff --git a/media/media.gyp b/media/media.gyp |
index 4caa658311031210c9b37a1e1362f4f7a69fab10..11c3fd957bb99478b60cc97b940db677997eb827 100644 |
--- a/media/media.gyp |
+++ b/media/media.gyp |
@@ -557,8 +557,21 @@ |
}, |
}], |
['OS == "android"', { |
- 'sources': [ |
- 'base/media_stub.cc', |
+ 'conditions' : [ |
+ ['use_openmax_dl_fft==1', { |
+ # FFT library requires Neon support, so we enable |
+ # WebAudio only if Neon is available. |
+ 'sources': [ |
+ 'base/media_android.cc', |
+ ], |
+ 'includes': [ |
+ '../build/android/cpufeatures.gypi', |
+ ], |
+ }, { |
+ 'sources': [ |
+ 'base/media_stub.cc', |
+ ], |
+ }], |
], |
'link_settings': { |
'libraries': [ |
@@ -1426,7 +1439,7 @@ |
}], |
['OS == "android"', { |
'targets': [ |
- { |
+ { |
'target_name': 'media_player_jni_headers', |
'type': 'none', |
'variables': { |
@@ -1445,6 +1458,7 @@ |
'base/android/java/src/org/chromium/media/AudioManagerAndroid.java', |
'base/android/java/src/org/chromium/media/MediaPlayerBridge.java', |
'base/android/java/src/org/chromium/media/MediaPlayerListener.java', |
+ 'base/android/java/src/org/chromium/media/WebAudioMediaCodecBridge.java', |
], |
'variables': { |
'jni_gen_package': 'media', |
@@ -1492,6 +1506,8 @@ |
'base/android/media_player_bridge.h', |
'base/android/media_player_listener.cc', |
'base/android/media_player_listener.h', |
+ 'base/android/webaudio_media_codec_bridge.cc', |
+ 'base/android/webaudio_media_codec_bridge.h', |
], |
'dependencies': [ |
'../base/base.gyp:base', |