Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(491)

Unified Diff: build/all.gyp

Issue 8770010: views: Move views.gyp to ui/views/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix aura build Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/all.gyp
diff --git a/build/all.gyp b/build/all.gyp
index abbf21177ad50309529489d3a19251357a779866..038df18e1be2d8b1a65b74039a76c88292420a58 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': [
« no previous file with comments | « no previous file | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698