summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-01 22:44:56 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-01 22:44:56 +0000
commita38b2ce626e92d88ae87039258d68ccd8f68aac0 (patch)
tree5fb5b08816ceac8ef9ddb8e0bac89b01998aae2d /build
parent62fce1c52d79a0707e6d1d5df3d43296a9b567a6 (diff)
downloadchromium_src-a38b2ce626e92d88ae87039258d68ccd8f68aac0.zip
chromium_src-a38b2ce626e92d88ae87039258d68ccd8f68aac0.tar.gz
chromium_src-a38b2ce626e92d88ae87039258d68ccd8f68aac0.tar.bz2
views: Move views.gyp to ui/views/.
BUG=104039 R=ben@chromium.org Review URL: http://codereview.chromium.org/8770010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@112561 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
-rw-r--r--build/all.gyp14
1 files changed, 7 insertions, 7 deletions
diff --git a/build/all.gyp b/build/all.gyp
index abbf211..038df18e 100644
--- a/build/all.gyp
+++ b/build/all.gyp
@@ -128,7 +128,7 @@
}],
['toolkit_views==1', {
'dependencies': [
- '../views/views.gyp:*',
+ '../ui/views/views.gyp:*',
],
}],
['use_aura==1', {
@@ -208,8 +208,8 @@
'../sandbox/sandbox.gyp:sbox_integration_tests',
'../sandbox/sandbox.gyp:sbox_unittests',
'../sandbox/sandbox.gyp:sbox_validation_tests',
- '../views/views.gyp:views_unittests',
'../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:copy_TestNetscapePlugIn',
+ '../ui/views/views.gyp:views_unittests',
# TODO(nsylvain) ui_tests.exe depends on test_shell_common.
# This should:
# 1) not be the case. OR.
@@ -267,8 +267,8 @@
'../sandbox/sandbox.gyp:sbox_integration_tests',
'../sandbox/sandbox.gyp:sbox_unittests',
'../sandbox/sandbox.gyp:sbox_validation_tests',
- '../views/views.gyp:views_unittests',
'../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:copy_TestNetscapePlugIn',
+ '../ui/views/views.gyp:views_unittests',
# TODO(nsylvain) ui_tests.exe depends on test_shell_common.
# This should:
# 1) not be the case. OR.
@@ -474,7 +474,7 @@
'../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests',
'../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests',
'../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:copy_TestNetscapePlugIn',
- '../views/views.gyp:views_unittests',
+ '../ui/views/views.gyp:views_unittests',
# TODO(nsylvain) ui_tests.exe depends on test_shell_common.
# This should:
# 1) not be the case. OR.
@@ -605,7 +605,7 @@
'../sql/sql.gyp:sql_unittests',
'../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests',
'../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests',
- '../views/views.gyp:views_unittests',
+ '../ui/views/views.gyp:views_unittests',
'temp_gyp/googleurl.gyp:googleurl_unittests',
],
},
@@ -623,8 +623,8 @@
'../ui/aura_shell/aura_shell.gyp:aura_shell_unittests',
'../ui/aura/aura.gyp:*',
'../ui/gfx/compositor/compositor.gyp:*',
- '../views/views.gyp:views',
- '../views/views.gyp:views_unittests',
+ '../ui/views/views.gyp:views',
+ '../ui/views/views.gyp:views_unittests',
'../webkit/webkit.gyp:pull_in_webkit_unit_tests',
],
'conditions': [