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

Side by Side Diff: chrome/chrome_tests_unit.gypi

Issue 2026973002: Moves ash/wm/common/resources back to ash (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: delete revived file Created 4 years, 6 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
« no previous file with comments | « chrome/chrome_tests.gypi ('k') | chrome/test/BUILD.gn » ('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 2012 The Chromium Authors. All rights reserved. 1 # Copyright 2012 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 'variables': { 5 'variables': {
6 'chrome_unit_tests_sources': [ 6 'chrome_unit_tests_sources': [
7 # histograms.xml is analyzed by AboutFlagsHistogramTest, so this 7 # histograms.xml is analyzed by AboutFlagsHistogramTest, so this
8 # dependency is needed to make commit bots run unit_tests on 8 # dependency is needed to make commit bots run unit_tests on
9 # histograms.xml changes. 9 # histograms.xml changes.
10 '../tools/metrics/histograms/histograms.xml', 10 '../tools/metrics/histograms/histograms.xml',
(...skipping 2397 matching lines...) Expand 10 before | Expand all | Expand 10 after
2408 ], 2408 ],
2409 }], 2409 }],
2410 ['use_ash==1', { 2410 ['use_ash==1', {
2411 # TODO(calamity): Consider moving the tests to regular 2411 # TODO(calamity): Consider moving the tests to regular
2412 # "chrome_unit_tests_sources" and not require Ash. crbug.com/439542. 2412 # "chrome_unit_tests_sources" and not require Ash. crbug.com/439542.
2413 'sources': [ '<@(chrome_unit_tests_ash_sources)' ], 2413 'sources': [ '<@(chrome_unit_tests_ash_sources)' ],
2414 'dependencies': [ 2414 'dependencies': [
2415 '../ash/ash.gyp:ash_test_support', 2415 '../ash/ash.gyp:ash_test_support',
2416 '../ash/ash_resources.gyp:ash_resources', 2416 '../ash/ash_resources.gyp:ash_resources',
2417 '../ash/ash_strings.gyp:ash_strings', 2417 '../ash/ash_strings.gyp:ash_strings',
2418 '../ash/wm/common/ash_wm_common_resources.gyp:ash_wm_common_resource s',
2419 ], 2418 ],
2420 # We eventually want to compile both in Win Aura builds, see 2419 # We eventually want to compile both in Win Aura builds, see
2421 # http://crbug.com/155545. 2420 # http://crbug.com/155545.
2422 'conditions': [ 2421 'conditions': [
2423 ['OS !="win"', { 2422 ['OS !="win"', {
2424 'sources!': [ 2423 'sources!': [
2425 'browser/ui/window_sizer/window_sizer_unittest.cc', 2424 'browser/ui/window_sizer/window_sizer_unittest.cc',
2426 ], 2425 ],
2427 }], 2426 }],
2428 ], 2427 ],
(...skipping 573 matching lines...) Expand 10 before | Expand all | Expand 10 after
3002 'dependencies': [ 3001 'dependencies': [
3003 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 3002 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
3004 ], 3003 ],
3005 }], 3004 }],
3006 ], 3005 ],
3007 }, 3006 },
3008 ], 3007 ],
3009 }], 3008 }],
3010 ], # 'conditions' 3009 ], # 'conditions'
3011 } 3010 }
OLDNEW
« no previous file with comments | « chrome/chrome_tests.gypi ('k') | chrome/test/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698