media/media.gyp - Issue 198333004: Move ui.gyp into ui/base/ directory.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: media/media.gyp

Issue 198333004: Move ui.gyp into ui/base/ directory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: REBASED Created 6 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: media/media.gyp

diff --git a/media/media.gyp b/media/media.gyp

index 78ece808002104ff7ec62ff6ce7940f745700b14..8f81efe833172f43c2077c0eee10a656d34d1b9a 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',

« no previous file with comments | « gpu/gles2_conform_support/gles2_conform_support.gyp ('k') | mojo/mojo_examples.gypi » ('j') | no next file with comments »