diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-13 10:20:37 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-13 10:20:37 +0000 |
| commit | ed8fd9152e0dff6c26f69f968e0d4aa4bd890d57 (patch) | |
| tree | 163fe12566ebad286d91d12820f078b240e2db26 /media | |
| parent | 4795329fcd7308914fcdbee6f824c250cfae2629 (diff) | |
| download | chromium_src-ed8fd9152e0dff6c26f69f968e0d4aa4bd890d57.zip chromium_src-ed8fd9152e0dff6c26f69f968e0d4aa4bd890d57.tar.gz chromium_src-ed8fd9152e0dff6c26f69f968e0d4aa4bd890d57.tar.bz2 | |
Move ui.gyp into ui/base/ directory.
This follows the rule we setup for //ui which states that each subdir
should be its own component with its own gyp file that lives in its
subdir.
The 'ui' target was renamed to ui_base to match the convention.
BUG=299841
TEST=gyp files.
TBR=ben@chromium.org
Review URL: https://codereview.chromium.org/198333004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@256788 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
| -rw-r--r-- | media/media.gyp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/media/media.gyp b/media/media.gyp index 78ece80..8f81efe 100644 --- a/media/media.gyp +++ b/media/media.gyp @@ -918,9 +918,9 @@ '../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/ui.gyp:ui', ], 'sources': [ 'audio/android/audio_android_unittest.cc', @@ -1167,17 +1167,17 @@ 'target_name': 'media_perftests', 'type': '<(gtest_target_type)', 'dependencies': [ - 'media', - 'media_test_support', - 'shared_memory_support', '../base/base.gyp:test_support_base', '../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_geometry', '../ui/gl/gl.gyp:gl', - '../ui/ui.gyp:ui', + 'media', + 'media_test_support', + 'shared_memory_support', ], 'sources': [ 'base/audio_bus_perftest.cc', |