Move webkit/renderer/media/android/ to content/renderer/media/android/.

webkit/renderer/media/webkit_media.gypi

 # 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.
 
 {
   'variables': {
     'conditions': [
       ['OS == "android" or OS == "ios"', {
         # Android and iOS don't use ffmpeg.
         'use_ffmpeg%': 0,
@@ skipping 20 matching lines @@
         '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '<(DEPTH)/cc/cc.gyp:cc',
         '<(DEPTH)/media/media.gyp:media',
         '<(DEPTH)/media/media.gyp:shared_memory_support',
         '<(DEPTH)/skia/skia.gyp:skia',
         '<(DEPTH)/third_party/WebKit/public/blink.gyp:blink',
         '<(DEPTH)/third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h',
         '<(DEPTH)/webkit/renderer/compositor_bindings/compositor_bindings.gyp:webkit_compositor_bindings',
       ],
       'sources': [
-        'android/audio_decoder_android.cc',
-        'android/media_source_delegate.cc',
-        'android/media_source_delegate.h',
-        'android/stream_texture_factory_android.h',
-        'android/webmediaplayer_android.cc',
-        'android/webmediaplayer_android.h',
-        'android/webmediaplayer_manager_android.cc',
-        'android/webmediaplayer_manager_android.h',
-        'android/webmediaplayer_proxy_android.cc',
-        'android/webmediaplayer_proxy_android.h',
-        'android/proxy_media_keys.cc',
-        'android/proxy_media_keys.h',
         'active_loader.cc',
         'active_loader.h',
         'audio_decoder.cc',
         'audio_decoder.h',
         'buffered_data_source.cc',
         'buffered_data_source.h',
         'buffered_resource_loader.cc',
         'buffered_resource_loader.h',
         'cache_util.cc',
         'cache_util.h',
         'crypto/key_systems.cc',
         'crypto/key_systems.h',
         'crypto/key_systems_info.cc',
         'crypto/key_systems_info.h',
         'crypto/ppapi_decryptor.cc',
         'crypto/ppapi_decryptor.h',
         'crypto/proxy_decryptor.cc',
         'crypto/proxy_decryptor.h',
-        'media_info_loader.cc',
-        'media_info_loader.h',
         'media_stream_audio_renderer.cc',
         'media_stream_audio_renderer.h',
         'media_stream_client.h',
         'preload.h',
         'simple_video_frame_provider.cc',
         'simple_video_frame_provider.h',
         'texttrack_impl.cc',
         'texttrack_impl.h',
         'video_frame_provider.cc',
         'video_frame_provider.h',
@@ skipping 21 matching lines @@
             'audio_decoder.cc',
             'audio_decoder.h',
             'filter_helpers.cc',
             'filter_helpers.h',
             'webmediaplayer_impl.cc',
             'webmediaplayer_impl.h',
             'webmediaplayer_proxy.cc',
             'webmediaplayer_proxy.h',
           ],
           'dependencies': [
             '<(DEPTH)/media/media.gyp:player_android',

[qinmin, 2013/06/21 04:37:05]

remove this?

           ],
         }, { # OS != "android"'

[qinmin, 2013/06/21 04:37:05]

this is also not needed

           'sources/': [
             ['exclude', '^android/'],
           ],
         }],
         ['google_tv == 1', {
           'sources!': [
             'crypto/key_systems_info.cc',
           ],
         }],
         ['enable_pepper_cdms != 1', {
@@ skipping 114 matching lines @@
               '-Wl,-exported_symbol,_PPP_InitializeModule',
               '-Wl,-exported_symbol,_PPP_ShutdownModule'
             ],
             'DYLIB_INSTALL_NAME_BASE': '@loader_path',
           },
         }],
       ],
     }
   ],
 }