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

Side by Side Diff: chrome/chrome_tests_unit.gypi

Issue 1994993003: Moves resources used by ash/wm/common to ash/wm/common/resources (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: repack chrome Created 4 years, 7 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
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 2388 matching lines...) Expand 10 before | Expand all | Expand 10 after
2399 ], 2399 ],
2400 }], 2400 }],
2401 ['use_ash==1', { 2401 ['use_ash==1', {
2402 # TODO(calamity): Consider moving the tests to regular 2402 # TODO(calamity): Consider moving the tests to regular
2403 # "chrome_unit_tests_sources" and not require Ash. crbug.com/439542. 2403 # "chrome_unit_tests_sources" and not require Ash. crbug.com/439542.
2404 'sources': [ '<@(chrome_unit_tests_ash_sources)' ], 2404 'sources': [ '<@(chrome_unit_tests_ash_sources)' ],
2405 'dependencies': [ 2405 'dependencies': [
2406 '../ash/ash.gyp:ash_test_support', 2406 '../ash/ash.gyp:ash_test_support',
2407 '../ash/ash_resources.gyp:ash_resources', 2407 '../ash/ash_resources.gyp:ash_resources',
2408 '../ash/ash_strings.gyp:ash_strings', 2408 '../ash/ash_strings.gyp:ash_strings',
2409 '../ash/wm/common/ash_wm_common_resources.gyp:ash_wm_common_resource s',
2409 ], 2410 ],
2410 # We eventually want to compile both in Win Aura builds, see 2411 # We eventually want to compile both in Win Aura builds, see
2411 # http://crbug.com/155545. 2412 # http://crbug.com/155545.
2412 'conditions': [ 2413 'conditions': [
2413 ['OS !="win"', { 2414 ['OS !="win"', {
2414 'sources!': [ 2415 'sources!': [
2415 'browser/ui/window_sizer/window_sizer_unittest.cc', 2416 'browser/ui/window_sizer/window_sizer_unittest.cc',
2416 ], 2417 ],
2417 }], 2418 }],
2418 ], 2419 ],
(...skipping 576 matching lines...) Expand 10 before | Expand all | Expand 10 after
2995 'dependencies': [ 2996 'dependencies': [
2996 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 2997 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
2997 ], 2998 ],
2998 }], 2999 }],
2999 ], 3000 ],
3000 }, 3001 },
3001 ], 3002 ],
3002 }], 3003 }],
3003 ], # 'conditions' 3004 ], # 'conditions'
3004 } 3005 }
OLDNEW
« ash/shelf/shelf_widget.cc ('K') | « chrome/chrome_tests.gypi ('k') | chrome/test/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698