Revert 131064 - Adding android mediaplayer implementation to chromium

This is initial step to upstream html5 video stack for chrome on android

BUG=
TEST=


Review URL: http://codereview.chromium.org/9699012

TBR=qinmin@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10009035

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@131070 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 2 insertions, 38 deletions

diff --git a/media/media.gyp b/media/media.gyp
index 30649c9..47d1337 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -911,44 +911,8 @@
         },
       ],
     }],
-    ['OS == "android"', {
-      'targets': [
-        {
-          'target_name': 'player_android',
-          'type': 'static_library',
-          'sources': [
-            'base/android/media_player_bridge.cc',
-            'base/android/media_player_bridge.h',
-          ],
-          'dependencies': [
-            '../base/base.gyp:base',
-          ],
-          'include_dirs': [
-            '<(SHARED_INTERMEDIATE_DIR)/media',
-          ],
-          'actions': [
-            {
-              'action_name': 'generate-jni-headers',
-              'inputs': [
-                '../base/android/jni_generator/jni_generator.py',
-                'base/android/java/org/chromium/media/MediaPlayerListener.java',
-              ],
-              'outputs': [
-                '<(SHARED_INTERMEDIATE_DIR)/media/jni/media_player_listener_jni.h',
-              ],
-              'action': [
-                'python',
-                '<(DEPTH)/base/android/jni_generator/jni_generator.py',
-                '-o',
-                '<@(_inputs)',
-                '<@(_outputs)',
-              ],
-            },
-          ],
-        },
-      ],
-    }, { # OS != "android"'
-      # Android does not use ffmpeg, so disable the targets which require it.
+    # Android does not use ffmpeg, so disable the targets which require it.
+    ['OS!="android"', {
       'targets': [
         {
           'target_name': 'ffmpeg_unittests',