From 9a1af193b777f77173642a004f87f356081ee27b Mon Sep 17 00:00:00 2001
From: "qinmin@chromium.org"
 <qinmin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Thu, 6 Jun 2013 03:09:59 +0000
Subject: 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
---
 media/base/media_android.cc | 21 ---------------------
 media/media.gyp             | 15 +--------------
 2 files changed, 1 insertion(+), 35 deletions(-)
 delete mode 100644 media/base/media_android.cc

(limited to 'media')

diff --git a/media/base/media_android.cc b/media/base/media_android.cc
deleted file mode 100644
index 090e73a..0000000
--- a/media/base/media_android.cc
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2013 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.
-
-#include "media/base/media.h"
-
-#include <cpu-features.h>
-
-#include "base/files/file_path.h"
-
-namespace media {
-namespace internal {
-
-bool InitializeMediaLibraryInternal(const base::FilePath& module_dir) {
-  // No real initialization is necessary but we do need to check if
-  // Neon is supported because the FFT library requires Neon.
-  return (android_getCpuFeatures() & ANDROID_CPU_ARM_FEATURE_NEON) != 0;
-}
-
-}  // namespace internal
-}  // namespace media
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.
-- 
cgit v1.1