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

Side by Side 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 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'targets': [ 6 'targets': [
7 { 7 {
8 'target_name': 'All', 8 'target_name': 'All',
9 'type': 'none', 9 'type': 'none',
10 'xcode_create_dependents_test_runner': 1, 10 'xcode_create_dependents_test_runner': 1,
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 '../third_party/gles2_book/gles2_book.gyp:*', 121 '../third_party/gles2_book/gles2_book.gyp:*',
122 '../tools/memory_watcher/memory_watcher.gyp:*', 122 '../tools/memory_watcher/memory_watcher.gyp:*',
123 ], 123 ],
124 }, { 124 }, {
125 'dependencies': [ 125 'dependencies': [
126 '../third_party/libevent/libevent.gyp:*', 126 '../third_party/libevent/libevent.gyp:*',
127 ], 127 ],
128 }], 128 }],
129 ['toolkit_views==1', { 129 ['toolkit_views==1', {
130 'dependencies': [ 130 'dependencies': [
131 '../views/views.gyp:*', 131 '../ui/views/views.gyp:*',
132 ], 132 ],
133 }], 133 }],
134 ['use_aura==1', { 134 ['use_aura==1', {
135 'dependencies': [ 135 'dependencies': [
136 '../ui/aura/aura.gyp:*', 136 '../ui/aura/aura.gyp:*',
137 '../ui/aura_shell/aura_shell.gyp:*', 137 '../ui/aura_shell/aura_shell.gyp:*',
138 ], 138 ],
139 }], 139 }],
140 ['remoting==1', { 140 ['remoting==1', {
141 'dependencies': [ 141 'dependencies': [
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
201 '../chrome_frame/chrome_frame.gyp:chrome_frame_net_tests', 201 '../chrome_frame/chrome_frame.gyp:chrome_frame_net_tests',
202 '../chrome_frame/chrome_frame.gyp:chrome_frame_perftests', 202 '../chrome_frame/chrome_frame.gyp:chrome_frame_perftests',
203 '../chrome_frame/chrome_frame.gyp:chrome_frame_reliability_tests', 203 '../chrome_frame/chrome_frame.gyp:chrome_frame_reliability_tests',
204 '../chrome_frame/chrome_frame.gyp:chrome_frame_tests', 204 '../chrome_frame/chrome_frame.gyp:chrome_frame_tests',
205 '../chrome_frame/chrome_frame.gyp:chrome_frame_unittests', 205 '../chrome_frame/chrome_frame.gyp:chrome_frame_unittests',
206 '../chrome_frame/chrome_frame.gyp:npchrome_frame', 206 '../chrome_frame/chrome_frame.gyp:npchrome_frame',
207 '../courgette/courgette.gyp:courgette_unittests', 207 '../courgette/courgette.gyp:courgette_unittests',
208 '../sandbox/sandbox.gyp:sbox_integration_tests', 208 '../sandbox/sandbox.gyp:sbox_integration_tests',
209 '../sandbox/sandbox.gyp:sbox_unittests', 209 '../sandbox/sandbox.gyp:sbox_unittests',
210 '../sandbox/sandbox.gyp:sbox_validation_tests', 210 '../sandbox/sandbox.gyp:sbox_validation_tests',
211 '../views/views.gyp:views_unittests',
212 '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:copy_TestNe tscapePlugIn', 211 '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:copy_TestNe tscapePlugIn',
212 '../ui/views/views.gyp:views_unittests',
213 # TODO(nsylvain) ui_tests.exe depends on test_shell_common. 213 # TODO(nsylvain) ui_tests.exe depends on test_shell_common.
214 # This should: 214 # This should:
215 # 1) not be the case. OR. 215 # 1) not be the case. OR.
216 # 2) be expressed in the ui tests dependencies. 216 # 2) be expressed in the ui tests dependencies.
217 '../webkit/webkit.gyp:test_shell_common', 217 '../webkit/webkit.gyp:test_shell_common',
218 ], 218 ],
219 }], 219 }],
220 ], 220 ],
221 }, # target_name: chromium_builder_tests 221 }, # target_name: chromium_builder_tests
222 { 222 {
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
260 #'../chrome_frame/chrome_frame.gyp:chrome_frame_net_tests', 260 #'../chrome_frame/chrome_frame.gyp:chrome_frame_net_tests',
261 #'../chrome_frame/chrome_frame.gyp:chrome_frame_perftests', 261 #'../chrome_frame/chrome_frame.gyp:chrome_frame_perftests',
262 #'../chrome_frame/chrome_frame.gyp:chrome_frame_reliability_tests', 262 #'../chrome_frame/chrome_frame.gyp:chrome_frame_reliability_tests',
263 #'../chrome_frame/chrome_frame.gyp:chrome_frame_tests', 263 #'../chrome_frame/chrome_frame.gyp:chrome_frame_tests',
264 #'../chrome_frame/chrome_frame.gyp:chrome_frame_unittests', 264 #'../chrome_frame/chrome_frame.gyp:chrome_frame_unittests',
265 #'../chrome_frame/chrome_frame.gyp:npchrome_frame', 265 #'../chrome_frame/chrome_frame.gyp:npchrome_frame',
266 '../courgette/courgette.gyp:courgette_unittests', 266 '../courgette/courgette.gyp:courgette_unittests',
267 '../sandbox/sandbox.gyp:sbox_integration_tests', 267 '../sandbox/sandbox.gyp:sbox_integration_tests',
268 '../sandbox/sandbox.gyp:sbox_unittests', 268 '../sandbox/sandbox.gyp:sbox_unittests',
269 '../sandbox/sandbox.gyp:sbox_validation_tests', 269 '../sandbox/sandbox.gyp:sbox_validation_tests',
270 '../views/views.gyp:views_unittests',
271 '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:copy_TestNe tscapePlugIn', 270 '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:copy_TestNe tscapePlugIn',
271 '../ui/views/views.gyp:views_unittests',
272 # TODO(nsylvain) ui_tests.exe depends on test_shell_common. 272 # TODO(nsylvain) ui_tests.exe depends on test_shell_common.
273 # This should: 273 # This should:
274 # 1) not be the case. OR. 274 # 1) not be the case. OR.
275 # 2) be expressed in the ui tests dependencies. 275 # 2) be expressed in the ui tests dependencies.
276 '../webkit/webkit.gyp:test_shell_common', 276 '../webkit/webkit.gyp:test_shell_common',
277 ], 277 ],
278 }], 278 }],
279 ], 279 ],
280 }, # target_name: chromium_2010_builder_tests 280 }, # target_name: chromium_2010_builder_tests
281 { 281 {
(...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after
467 '../gpu/gpu.gyp:gpu_unittests', 467 '../gpu/gpu.gyp:gpu_unittests',
468 '../ipc/ipc.gyp:ipc_tests', 468 '../ipc/ipc.gyp:ipc_tests',
469 '../jingle/jingle.gyp:jingle_unittests', 469 '../jingle/jingle.gyp:jingle_unittests',
470 '../media/media.gyp:media_unittests', 470 '../media/media.gyp:media_unittests',
471 '../printing/printing.gyp:printing_unittests', 471 '../printing/printing.gyp:printing_unittests',
472 '../remoting/remoting.gyp:remoting_unittests', 472 '../remoting/remoting.gyp:remoting_unittests',
473 '../sql/sql.gyp:sql_unittests', 473 '../sql/sql.gyp:sql_unittests',
474 '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalid ation_unittests', 474 '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalid ation_unittests',
475 '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_uni ttests', 475 '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_uni ttests',
476 '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:copy_TestNe tscapePlugIn', 476 '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:copy_TestNe tscapePlugIn',
477 '../views/views.gyp:views_unittests', 477 '../ui/views/views.gyp:views_unittests',
478 # TODO(nsylvain) ui_tests.exe depends on test_shell_common. 478 # TODO(nsylvain) ui_tests.exe depends on test_shell_common.
479 # This should: 479 # This should:
480 # 1) not be the case. OR. 480 # 1) not be the case. OR.
481 # 2) be expressed in the ui tests dependencies. 481 # 2) be expressed in the ui tests dependencies.
482 '../webkit/webkit.gyp:test_shell_common', 482 '../webkit/webkit.gyp:test_shell_common',
483 'temp_gyp/googleurl.gyp:googleurl_unittests', 483 'temp_gyp/googleurl.gyp:googleurl_unittests',
484 ], 484 ],
485 }, 485 },
486 { 486 {
487 'target_name': 'chromium_builder_dbg_tsan_win', 487 'target_name': 'chromium_builder_dbg_tsan_win',
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
598 '../ipc/ipc.gyp:ipc_tests', 598 '../ipc/ipc.gyp:ipc_tests',
599 '../jingle/jingle.gyp:jingle_unittests', 599 '../jingle/jingle.gyp:jingle_unittests',
600 '../media/media.gyp:ffmpeg_tests', 600 '../media/media.gyp:ffmpeg_tests',
601 '../media/media.gyp:media_unittests', 601 '../media/media.gyp:media_unittests',
602 '../net/net.gyp:net_unittests', 602 '../net/net.gyp:net_unittests',
603 '../printing/printing.gyp:printing_unittests', 603 '../printing/printing.gyp:printing_unittests',
604 '../remoting/remoting.gyp:remoting_unittests', 604 '../remoting/remoting.gyp:remoting_unittests',
605 '../sql/sql.gyp:sql_unittests', 605 '../sql/sql.gyp:sql_unittests',
606 '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalid ation_unittests', 606 '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalid ation_unittests',
607 '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_uni ttests', 607 '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_uni ttests',
608 '../views/views.gyp:views_unittests', 608 '../ui/views/views.gyp:views_unittests',
609 'temp_gyp/googleurl.gyp:googleurl_unittests', 609 'temp_gyp/googleurl.gyp:googleurl_unittests',
610 ], 610 ],
611 }, 611 },
612 ], # targets 612 ], # targets
613 }], # "chromeos==1" 613 }], # "chromeos==1"
614 ['use_aura==1', { 614 ['use_aura==1', {
615 'targets': [ 615 'targets': [
616 { 616 {
617 'target_name': 'aura_builder', 617 'target_name': 'aura_builder',
618 'type': 'none', 618 'type': 'none',
619 'dependencies': [ 619 'dependencies': [
620 '../chrome/chrome.gyp:chrome', 620 '../chrome/chrome.gyp:chrome',
621 '../chrome/chrome.gyp:unit_tests', 621 '../chrome/chrome.gyp:unit_tests',
622 '../ui/aura_shell/aura_shell.gyp:aura_shell_exe', 622 '../ui/aura_shell/aura_shell.gyp:aura_shell_exe',
623 '../ui/aura_shell/aura_shell.gyp:aura_shell_unittests', 623 '../ui/aura_shell/aura_shell.gyp:aura_shell_unittests',
624 '../ui/aura/aura.gyp:*', 624 '../ui/aura/aura.gyp:*',
625 '../ui/gfx/compositor/compositor.gyp:*', 625 '../ui/gfx/compositor/compositor.gyp:*',
626 '../views/views.gyp:views', 626 '../ui/views/views.gyp:views',
627 '../views/views.gyp:views_unittests', 627 '../ui/views/views.gyp:views_unittests',
628 '../webkit/webkit.gyp:pull_in_webkit_unit_tests', 628 '../webkit/webkit.gyp:pull_in_webkit_unit_tests',
629 ], 629 ],
630 'conditions': [ 630 'conditions': [
631 ['OS=="win"', { 631 ['OS=="win"', {
632 # Remove this when we have the real compositor. 632 # Remove this when we have the real compositor.
633 'copies': [ 633 'copies': [
634 { 634 {
635 'destination': '<(PRODUCT_DIR)', 635 'destination': '<(PRODUCT_DIR)',
636 'files': ['../third_party/directxsdk/files/dlls/D3DX10d_43.dll '] 636 'files': ['../third_party/directxsdk/files/dlls/D3DX10d_43.dll ']
637 }, 637 },
(...skipping 12 matching lines...) Expand all
650 '../sql/sql.gyp:sql_unittests', 650 '../sql/sql.gyp:sql_unittests',
651 '../ui/ui.gyp:gfx_unittests', 651 '../ui/ui.gyp:gfx_unittests',
652 ], 652 ],
653 }], 653 }],
654 ], 654 ],
655 }, 655 },
656 ], # targets 656 ], # targets
657 }], # "use_aura==1" 657 }], # "use_aura==1"
658 ], # conditions 658 ], # conditions
659 } 659 }
OLDNEW
« 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