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

Side by Side Diff: chrome/chrome_tests.gypi

Issue 381463002: Add chrome/browser/ui to the GN build. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add %$&*ing missing comma 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
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 319 matching lines...) Expand 10 before | Expand all | Expand 10 after
330 330
331 'app/chrome_dll.rc', 331 'app/chrome_dll.rc',
332 'test/data/resource.rc', 332 'test/data/resource.rc',
333 333
334 # TODO: It would be nice to have these pulled in 334 # TODO: It would be nice to have these pulled in
335 # automatically from direct_dependent_settings in 335 # automatically from direct_dependent_settings in
336 # their various targets (net.gyp:net_resources, etc.), 336 # their various targets (net.gyp:net_resources, etc.),
337 # but that causes errors in other targets when 337 # but that causes errors in other targets when
338 # resulting .res files get referenced multiple times. 338 # resulting .res files get referenced multiple times.
339 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc', 339 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
340 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_unscaled_resources.rc ', 340 '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_unscaled_resources.rc',
341 341
342 'browser/ui/views/accessibility/browser_views_accessibility_browsert est.cc', 342 'browser/ui/views/accessibility/browser_views_accessibility_browsert est.cc',
343 ], 343 ],
344 'conditions': [ 344 'conditions': [
345 ['win_use_allocator_shim==1', { 345 ['win_use_allocator_shim==1', {
346 'dependencies': [ 346 'dependencies': [
347 '../base/allocator/allocator.gyp:allocator', 347 '../base/allocator/allocator.gyp:allocator',
348 ], 348 ],
349 }], 349 }],
350 ['use_aura==1', { 350 ['use_aura==1', {
(...skipping 1487 matching lines...) Expand 10 before | Expand all | Expand 10 after
1838 'browser/extensions/api/webrtc_audio_private/webrtc_audio_private_br owsertest.cc', 1838 'browser/extensions/api/webrtc_audio_private/webrtc_audio_private_br owsertest.cc',
1839 'browser/extensions/api/webrtc_logging_private/webrtc_logging_privat e_apitest.cc', 1839 'browser/extensions/api/webrtc_logging_private/webrtc_logging_privat e_apitest.cc',
1840 'browser/media/chrome_webrtc_browsertest.cc', 1840 'browser/media/chrome_webrtc_browsertest.cc',
1841 'browser/media/chrome_webrtc_disable_encryption_flag_browsertest.cc' , 1841 'browser/media/chrome_webrtc_disable_encryption_flag_browsertest.cc' ,
1842 'browser/media/chrome_webrtc_getmediadevices_browsertest.cc', 1842 'browser/media/chrome_webrtc_getmediadevices_browsertest.cc',
1843 ], 1843 ],
1844 }], 1844 }],
1845 ['OS=="win"', { 1845 ['OS=="win"', {
1846 'sources': [ 1846 'sources': [
1847 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc', 1847 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
1848 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_unscaled_resources.rc ', 1848 '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_unscaled_resources.rc',
1849 ], 1849 ],
1850 'include_dirs': [ 1850 'include_dirs': [
1851 '<(DEPTH)/third_party/wtl/include', 1851 '<(DEPTH)/third_party/wtl/include',
1852 ], 1852 ],
1853 'dependencies': [ 1853 'dependencies': [
1854 'chrome_version_resources', 1854 'chrome_version_resources',
1855 ], 1855 ],
1856 'conditions': [ 1856 'conditions': [
1857 ['win_use_allocator_shim==1', { 1857 ['win_use_allocator_shim==1', {
1858 'dependencies': [ 1858 'dependencies': [
(...skipping 301 matching lines...) Expand 10 before | Expand all | Expand 10 after
2160 '<(RULE_INPUT_PATH)', 2160 '<(RULE_INPUT_PATH)',
2161 'chrome/<(RULE_INPUT_DIRNAME)/<(RULE_INPUT_ROOT).js', 2161 'chrome/<(RULE_INPUT_DIRNAME)/<(RULE_INPUT_ROOT).js',
2162 '<@(_outputs)', 2162 '<@(_outputs)',
2163 ], 2163 ],
2164 }, 2164 },
2165 ], 2165 ],
2166 'conditions': [ 2166 'conditions': [
2167 ['OS=="win"', { 2167 ['OS=="win"', {
2168 'sources': [ 2168 'sources': [
2169 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc', 2169 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
2170 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_unscaled_resources.rc ', 2170 '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_unscaled_resources.rc',
2171 ], 2171 ],
2172 'include_dirs': [ 2172 'include_dirs': [
2173 '<(DEPTH)/third_party/wtl/include', 2173 '<(DEPTH)/third_party/wtl/include',
2174 ], 2174 ],
2175 'dependencies': [ 2175 'dependencies': [
2176 'chrome_version_resources', 2176 'chrome_version_resources',
2177 ], 2177 ],
2178 'conditions': [ 2178 'conditions': [
2179 ['win_use_allocator_shim==1', { 2179 ['win_use_allocator_shim==1', {
2180 'dependencies': [ 2180 'dependencies': [
(...skipping 266 matching lines...) Expand 10 before | Expand all | Expand 10 after
2447 # Dictionary sync is disabled on Mac. 2447 # Dictionary sync is disabled on Mac.
2448 'sources!': [ 2448 'sources!': [
2449 'browser/sync/test/integration/multiple_client_dictionary_sync_test. cc', 2449 'browser/sync/test/integration/multiple_client_dictionary_sync_test. cc',
2450 'browser/sync/test/integration/single_client_dictionary_sync_test.cc ', 2450 'browser/sync/test/integration/single_client_dictionary_sync_test.cc ',
2451 'browser/sync/test/integration/two_client_dictionary_sync_test.cc', 2451 'browser/sync/test/integration/two_client_dictionary_sync_test.cc',
2452 ], 2452 ],
2453 }], 2453 }],
2454 ['OS=="win"', { 2454 ['OS=="win"', {
2455 'sources': [ 2455 'sources': [
2456 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc', 2456 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
2457 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_unscaled_resources.rc ', 2457 '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_unscaled_resources.rc',
2458 ], 2458 ],
2459 'include_dirs': [ 2459 'include_dirs': [
2460 '<(DEPTH)/third_party/wtl/include', 2460 '<(DEPTH)/third_party/wtl/include',
2461 ], 2461 ],
2462 'dependencies': [ 2462 'dependencies': [
2463 'chrome_version_resources', 2463 'chrome_version_resources',
2464 ], 2464 ],
2465 'conditions': [ 2465 'conditions': [
2466 ['win_use_allocator_shim==1', { 2466 ['win_use_allocator_shim==1', {
2467 'dependencies': [ 2467 'dependencies': [
(...skipping 518 matching lines...) Expand 10 before | Expand all | Expand 10 after
2986 ['enable_webrtc==1', { 2986 ['enable_webrtc==1', {
2987 'dependencies': [ 2987 'dependencies': [
2988 '../third_party/libjingle/libjingle.gyp:libjingle_webrtc' 2988 '../third_party/libjingle/libjingle.gyp:libjingle_webrtc'
2989 ] 2989 ]
2990 }], 2990 }],
2991 ], 2991 ],
2992 }] 2992 }]
2993 }], 2993 }],
2994 ], # 'conditions' 2994 ], # 'conditions'
2995 } 2995 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698