| Index: media/media.gyp
|
| diff --git a/media/media.gyp b/media/media.gyp
|
| index 6c30b89ab1ca60540e6d1d998c30273679439b79..0aa1719884152dd109297ac0cbaf9465905c4341 100644
|
| --- a/media/media.gyp
|
| +++ b/media/media.gyp
|
| @@ -1014,7 +1014,6 @@
|
| '../testing/gmock.gyp:gmock',
|
| '../testing/gtest.gyp:gtest',
|
| '../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h',
|
| - '../ui/base/ui_base.gyp:ui_base',
|
| '../ui/gfx/gfx.gyp:gfx',
|
| '../ui/gfx/gfx.gyp:gfx_geometry',
|
| '../ui/gfx/gfx.gyp:gfx_test_support',
|
| @@ -1292,11 +1291,9 @@
|
| '../testing/gmock.gyp:gmock',
|
| '../testing/gtest.gyp:gtest',
|
| '../testing/perf/perf_test.gyp:perf_test',
|
| - '../ui/base/ui_base.gyp:ui_base',
|
| '../ui/gfx/gfx.gyp:gfx',
|
| '../ui/gfx/gfx.gyp:gfx_test_support',
|
| '../ui/gfx/gfx.gyp:gfx_geometry',
|
| - '../ui/gl/gl.gyp:gl',
|
| 'media',
|
| 'media_test_support',
|
| 'shared_memory_support',
|
| @@ -1319,9 +1316,10 @@
|
| ],
|
| }],
|
| ['OS=="android"', {
|
| - 'dependencies': [
|
| - '../testing/android/native_test.gyp:native_test_native_code',
|
| - ],
|
| + 'dependencies': [
|
| + '../testing/android/native_test.gyp:native_test_native_code',
|
| + '../ui/gl/gl.gyp:gl',
|
| + ],
|
| }],
|
| ['media_use_ffmpeg==1', {
|
| 'dependencies': [
|
| @@ -1343,7 +1341,6 @@
|
| 'media',
|
| 'shared_memory_support',
|
| '../base/base.gyp:base',
|
| - '../net/net.gyp:net_test_support',
|
| '../skia/skia.gyp:skia',
|
| '../testing/gmock.gyp:gmock',
|
| '../testing/gtest.gyp:gtest',
|
|
|