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

Side by Side Diff: chrome/chrome_tests.gypi

Issue 381113004: Add chrome/browser/ui to the GN build. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 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:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/chrome_resources.gyp ('k') | chrome/chrome_tests_unit.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 2013 The Chromium Authors. All rights reserved. 1 # Copyright 2013 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 'includes': [ 5 'includes': [
6 'js_unittest_vars.gypi', 6 'js_unittest_vars.gypi',
7 ], 7 ],
8 'targets': [ 8 'targets': [
9 { 9 {
10 'target_name': 'interactive_ui_tests', 10 'target_name': 'interactive_ui_tests',
(...skipping 322 matching lines...) Expand 10 before | Expand all | Expand 10 after
333 333
334 'app/chrome_dll.rc', 334 'app/chrome_dll.rc',
335 'test/data/resource.rc', 335 'test/data/resource.rc',
336 336
337 # TODO: It would be nice to have these pulled in 337 # TODO: It would be nice to have these pulled in
338 # automatically from direct_dependent_settings in 338 # automatically from direct_dependent_settings in
339 # their various targets (net.gyp:net_resources, etc.), 339 # their various targets (net.gyp:net_resources, etc.),
340 # but that causes errors in other targets when 340 # but that causes errors in other targets when
341 # resulting .res files get referenced multiple times. 341 # resulting .res files get referenced multiple times.
342 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc', 342 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
343 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_unscaled_resources.rc ', 343 '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_unscaled_resources.rc',
344 344
345 'browser/ui/views/accessibility/browser_views_accessibility_browsert est.cc', 345 'browser/ui/views/accessibility/browser_views_accessibility_browsert est.cc',
346 ], 346 ],
347 'conditions': [ 347 'conditions': [
348 ['win_use_allocator_shim==1', { 348 ['win_use_allocator_shim==1', {
349 'dependencies': [ 349 'dependencies': [
350 '../base/allocator/allocator.gyp:allocator', 350 '../base/allocator/allocator.gyp:allocator',
351 ], 351 ],
352 }], 352 }],
353 ['use_aura==1', { 353 ['use_aura==1', {
(...skipping 1491 matching lines...) Expand 10 before | Expand all | Expand 10 after
1845 'browser/extensions/api/webrtc_audio_private/webrtc_audio_private_br owsertest.cc', 1845 'browser/extensions/api/webrtc_audio_private/webrtc_audio_private_br owsertest.cc',
1846 'browser/extensions/api/webrtc_logging_private/webrtc_logging_privat e_apitest.cc', 1846 'browser/extensions/api/webrtc_logging_private/webrtc_logging_privat e_apitest.cc',
1847 'browser/media/chrome_webrtc_browsertest.cc', 1847 'browser/media/chrome_webrtc_browsertest.cc',
1848 'browser/media/chrome_webrtc_disable_encryption_flag_browsertest.cc' , 1848 'browser/media/chrome_webrtc_disable_encryption_flag_browsertest.cc' ,
1849 'browser/media/chrome_webrtc_getmediadevices_browsertest.cc', 1849 'browser/media/chrome_webrtc_getmediadevices_browsertest.cc',
1850 ], 1850 ],
1851 }], 1851 }],
1852 ['OS=="win"', { 1852 ['OS=="win"', {
1853 'sources': [ 1853 'sources': [
1854 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc', 1854 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
1855 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_unscaled_resources.rc ', 1855 '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_unscaled_resources.rc',
1856 ], 1856 ],
1857 'include_dirs': [ 1857 'include_dirs': [
1858 '<(DEPTH)/third_party/wtl/include', 1858 '<(DEPTH)/third_party/wtl/include',
1859 ], 1859 ],
1860 'dependencies': [ 1860 'dependencies': [
1861 'chrome_version_resources', 1861 'chrome_version_resources',
1862 ], 1862 ],
1863 'conditions': [ 1863 'conditions': [
1864 ['win_use_allocator_shim==1', { 1864 ['win_use_allocator_shim==1', {
1865 'dependencies': [ 1865 'dependencies': [
(...skipping 301 matching lines...) Expand 10 before | Expand all | Expand 10 after
2167 '<(RULE_INPUT_PATH)', 2167 '<(RULE_INPUT_PATH)',
2168 'chrome/<(RULE_INPUT_DIRNAME)/<(RULE_INPUT_ROOT).js', 2168 'chrome/<(RULE_INPUT_DIRNAME)/<(RULE_INPUT_ROOT).js',
2169 '<@(_outputs)', 2169 '<@(_outputs)',
2170 ], 2170 ],
2171 }, 2171 },
2172 ], 2172 ],
2173 'conditions': [ 2173 'conditions': [
2174 ['OS=="win"', { 2174 ['OS=="win"', {
2175 'sources': [ 2175 'sources': [
2176 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc', 2176 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
2177 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_unscaled_resources.rc ', 2177 '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_unscaled_resources.rc',
2178 ], 2178 ],
2179 'include_dirs': [ 2179 'include_dirs': [
2180 '<(DEPTH)/third_party/wtl/include', 2180 '<(DEPTH)/third_party/wtl/include',
2181 ], 2181 ],
2182 'dependencies': [ 2182 'dependencies': [
2183 'chrome_version_resources', 2183 'chrome_version_resources',
2184 ], 2184 ],
2185 'conditions': [ 2185 'conditions': [
2186 ['win_use_allocator_shim==1', { 2186 ['win_use_allocator_shim==1', {
2187 'dependencies': [ 2187 'dependencies': [
(...skipping 266 matching lines...) Expand 10 before | Expand all | Expand 10 after
2454 # Dictionary sync is disabled on Mac. 2454 # Dictionary sync is disabled on Mac.
2455 'sources!': [ 2455 'sources!': [
2456 'browser/sync/test/integration/multiple_client_dictionary_sync_test. cc', 2456 'browser/sync/test/integration/multiple_client_dictionary_sync_test. cc',
2457 'browser/sync/test/integration/single_client_dictionary_sync_test.cc ', 2457 'browser/sync/test/integration/single_client_dictionary_sync_test.cc ',
2458 'browser/sync/test/integration/two_client_dictionary_sync_test.cc', 2458 'browser/sync/test/integration/two_client_dictionary_sync_test.cc',
2459 ], 2459 ],
2460 }], 2460 }],
2461 ['OS=="win"', { 2461 ['OS=="win"', {
2462 'sources': [ 2462 'sources': [
2463 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc', 2463 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
2464 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_unscaled_resources.rc ', 2464 '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_unscaled_resources.rc',
2465 ], 2465 ],
2466 'include_dirs': [ 2466 'include_dirs': [
2467 '<(DEPTH)/third_party/wtl/include', 2467 '<(DEPTH)/third_party/wtl/include',
2468 ], 2468 ],
2469 'dependencies': [ 2469 'dependencies': [
2470 'chrome_version_resources', 2470 'chrome_version_resources',
2471 ], 2471 ],
2472 'conditions': [ 2472 'conditions': [
2473 ['win_use_allocator_shim==1', { 2473 ['win_use_allocator_shim==1', {
2474 'dependencies': [ 2474 'dependencies': [
(...skipping 518 matching lines...) Expand 10 before | Expand all | Expand 10 after
2993 ['enable_webrtc==1', { 2993 ['enable_webrtc==1', {
2994 'dependencies': [ 2994 'dependencies': [
2995 '../third_party/libjingle/libjingle.gyp:libjingle_webrtc' 2995 '../third_party/libjingle/libjingle.gyp:libjingle_webrtc'
2996 ] 2996 ]
2997 }], 2997 }],
2998 ], 2998 ],
2999 }] 2999 }]
3000 }], 3000 }],
3001 ], # 'conditions' 3001 ], # 'conditions'
3002 } 3002 }
OLDNEW
« no previous file with comments | « chrome/chrome_resources.gyp ('k') | chrome/chrome_tests_unit.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698