| Index: webkit/media/webkit_media.gypi
|
| diff --git a/webkit/media/webkit_media.gypi b/webkit/media/webkit_media.gypi
|
| index ce3ab1670c189c85cd57f6edb09b9bdc0cd277b6..4cbe8664a930bf7392d61416786e70d12da550e9 100644
|
| --- a/webkit/media/webkit_media.gypi
|
| +++ b/webkit/media/webkit_media.gypi
|
| @@ -5,11 +5,6 @@
|
| {
|
| 'variables': {
|
| 'conditions': [
|
| - ['inside_chromium_build==0', {
|
| - 'webkit_src_dir': '../../../../..',
|
| - },{
|
| - 'webkit_src_dir': '../../third_party/WebKit',
|
| - }],
|
| ['OS == "android" or OS == "ios"', {
|
| # Android and iOS don't use ffmpeg.
|
| 'use_ffmpeg%': 0,
|
| @@ -39,9 +34,9 @@
|
| '<(DEPTH)/media/media.gyp:shared_memory_support',
|
| '<(DEPTH)/media/media.gyp:yuv_convert',
|
| '<(DEPTH)/skia/skia.gyp:skia',
|
| + '<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
|
| '<(DEPTH)/third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h',
|
| '<(DEPTH)/webkit/compositor_bindings/compositor_bindings.gyp:webkit_compositor_bindings',
|
| - '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit',
|
| ],
|
| 'sources': [
|
| 'android/audio_decoder_android.cc',
|
| @@ -97,11 +92,6 @@
|
| 'websourcebuffer_impl.h',
|
| ],
|
| 'conditions': [
|
| - ['inside_chromium_build == 0', {
|
| - 'dependencies': [
|
| - '<(DEPTH)/webkit/support/setup_third_party.gyp:third_party_headers',
|
| - ],
|
| - }],
|
| ['OS == "android"', {
|
| 'sources!': [
|
| 'audio_decoder.cc',
|
|
|