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

Side by Side Diff: chrome/chrome_tests_unit.gypi

Issue 1458653002: New build flag system, convert Google Now flag (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 5 years, 1 month 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 1638 matching lines...) Expand 10 before | Expand all | Expand 10 after
1649 # 1649 #
1650 # GN version: //chrome/test:test_support but that is split apart into 1650 # GN version: //chrome/test:test_support but that is split apart into
1651 # separate test_support targets for that various subdirectories under 1651 # separate test_support targets for that various subdirectories under
1652 # chrome. 1652 # chrome.
1653 'target_name': 'test_support_common', 1653 'target_name': 'test_support_common',
1654 'type': 'static_library', 1654 'type': 'static_library',
1655 'dependencies': [ 1655 'dependencies': [
1656 # NOTE: New dependencies should generally be added in the OS!="ios" 1656 # NOTE: New dependencies should generally be added in the OS!="ios"
1657 # dependencies block below, rather than here. 1657 # dependencies block below, rather than here.
1658 'browser', 1658 'browser',
1659 'chrome_common_features',
1659 'chrome_resources.gyp:chrome_resources', 1660 'chrome_resources.gyp:chrome_resources',
1660 'chrome_resources.gyp:chrome_strings', 1661 'chrome_resources.gyp:chrome_strings',
1661 'chrome_resources.gyp:theme_resources', 1662 'chrome_resources.gyp:theme_resources',
1662 'common', 1663 'common',
1663 '../base/base.gyp:base_prefs_test_support', 1664 '../base/base.gyp:base_prefs_test_support',
1664 '../base/base.gyp:test_support_base', 1665 '../base/base.gyp:test_support_base',
1665 '../components/components.gyp:bookmarks_test_support', 1666 '../components/components.gyp:bookmarks_test_support',
1666 '../components/components.gyp:gcm_driver_test_support', 1667 '../components/components.gyp:gcm_driver_test_support',
1667 '../components/components.gyp:history_core_test_support', 1668 '../components/components.gyp:history_core_test_support',
1668 '../components/components.gyp:instance_id_test_support', 1669 '../components/components.gyp:instance_id_test_support',
(...skipping 534 matching lines...) Expand 10 before | Expand all | Expand 10 after
2203 '../courgette/courgette.gyp:courgette_lib', 2204 '../courgette/courgette.gyp:courgette_lib',
2204 '../google_apis/google_apis.gyp:google_apis', 2205 '../google_apis/google_apis.gyp:google_apis',
2205 '../skia/skia.gyp:skia', 2206 '../skia/skia.gyp:skia',
2206 '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidatio n', 2207 '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidatio n',
2207 '../third_party/icu/icu.gyp:icui18n', 2208 '../third_party/icu/icu.gyp:icui18n',
2208 '../third_party/icu/icu.gyp:icuuc', 2209 '../third_party/icu/icu.gyp:icuuc',
2209 '../third_party/libxml/libxml.gyp:libxml', 2210 '../third_party/libxml/libxml.gyp:libxml',
2210 '../ui/base/ui_base.gyp:ui_base_test_support', 2211 '../ui/base/ui_base.gyp:ui_base_test_support',
2211 '../ui/gfx/gfx.gyp:gfx_test_support', 2212 '../ui/gfx/gfx.gyp:gfx_test_support',
2212 '../ui/resources/ui_resources.gyp:ui_resources', 2213 '../ui/resources/ui_resources.gyp:ui_resources',
2214 'chrome_common_features',
2213 'chrome_resources.gyp:chrome_resources', 2215 'chrome_resources.gyp:chrome_resources',
2214 'chrome_resources.gyp:chrome_strings', 2216 'chrome_resources.gyp:chrome_strings',
2215 ], 2217 ],
2216 'include_dirs': [ 2218 'include_dirs': [
2217 '..', 2219 '..',
2218 ], 2220 ],
2219 'msvs_settings': { 2221 'msvs_settings': {
2220 'VCLinkerTool': { 2222 'VCLinkerTool': {
2221 'conditions': [ 2223 'conditions': [
2222 ['incremental_chrome_dll==1', { 2224 ['incremental_chrome_dll==1', {
(...skipping 766 matching lines...) Expand 10 before | Expand all | Expand 10 after
2989 'dependencies': [ 2991 'dependencies': [
2990 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 2992 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
2991 ], 2993 ],
2992 }], 2994 }],
2993 ], 2995 ],
2994 }, 2996 },
2995 ], 2997 ],
2996 }], 2998 }],
2997 ], # 'conditions' 2999 ], # 'conditions'
2998 } 3000 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698