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

Side by Side Diff: chrome/chrome_tests_unit.gypi

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

Powered by Google App Engine
This is Rietveld 408576698