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

Side by Side Diff: chrome/chrome_tests_unit.gypi

Issue 1554443003: Stop linking in the old Mojo EDK. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge and fix new flaky test Created 4 years, 11 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_browser_ui.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 2166 matching lines...) Expand 10 before | Expand all | Expand 10 after
2177 'target_name': 'test_support_unit', 2177 'target_name': 'test_support_unit',
2178 'type': 'static_library', 2178 'type': 'static_library',
2179 'dependencies': [ 2179 'dependencies': [
2180 'chrome_resources.gyp:chrome_resources', 2180 'chrome_resources.gyp:chrome_resources',
2181 'chrome_resources.gyp:chrome_strings', 2181 'chrome_resources.gyp:chrome_strings',
2182 'browser', 2182 'browser',
2183 'common', 2183 'common',
2184 'test_support_common', 2184 'test_support_common',
2185 '../base/base.gyp:base', 2185 '../base/base.gyp:base',
2186 '../mojo/mojo_base.gyp:mojo_environment_chromium', 2186 '../mojo/mojo_base.gyp:mojo_environment_chromium',
2187 '../mojo/mojo_edk.gyp:mojo_system_impl',
2187 '../skia/skia.gyp:skia', 2188 '../skia/skia.gyp:skia',
2188 '../sync/sync.gyp:sync', 2189 '../sync/sync.gyp:sync',
2189 '../testing/gmock.gyp:gmock', 2190 '../testing/gmock.gyp:gmock',
2190 '../testing/gtest.gyp:gtest', 2191 '../testing/gtest.gyp:gtest',
2191 '../third_party/mojo/mojo_edk.gyp:mojo_system_impl',
2192 ], 2192 ],
2193 'include_dirs': [ 2193 'include_dirs': [
2194 '..', 2194 '..',
2195 ], 2195 ],
2196 'sources': [ 2196 'sources': [
2197 'browser/sync/glue/session_sync_test_helper.cc', 2197 'browser/sync/glue/session_sync_test_helper.cc',
2198 'browser/sync/glue/session_sync_test_helper.h', 2198 'browser/sync/glue/session_sync_test_helper.h',
2199 'test/base/run_all_unittests.cc', 2199 'test/base/run_all_unittests.cc',
2200 ], 2200 ],
2201 'conditions': [ 2201 'conditions': [
(...skipping 855 matching lines...) Expand 10 before | Expand all | Expand 10 after
3057 'dependencies': [ 3057 'dependencies': [
3058 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 3058 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
3059 ], 3059 ],
3060 }], 3060 }],
3061 ], 3061 ],
3062 }, 3062 },
3063 ], 3063 ],
3064 }], 3064 }],
3065 ], # 'conditions' 3065 ], # 'conditions'
3066 } 3066 }
OLDNEW
« no previous file with comments | « chrome/chrome_browser_ui.gypi ('k') | chrome/test/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698