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

Side by Side Diff: extensions/extensions_tests.gyp

Issue 1314313003: Revert of Add missing runtime dependencies to *_run targets. (Closed) Base URL: https://chromium.googlesource.com/a/chromium/src.git@master
Patch Set: Created 5 years, 3 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 | « content/content_tests.gypi ('k') | extensions/shell/app_shell.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 { 1 {
2 'includes': [ 2 'includes': [
3 'extensions_tests.gypi', 3 'extensions_tests.gypi',
4 ], 4 ],
5 'variables': { 5 'variables': {
6 # Product name is used for Mac bundle. 6 # Product name is used for Mac bundle.
7 'app_shell_product_name': 'App Shell', 7 'app_shell_product_name': 'App Shell',
8 # The version is high enough to be supported by Omaha (at least 31) 8 # The version is high enough to be supported by Omaha (at least 31)
9 # but fake enough to be obviously not a Chrome release. 9 # but fake enough to be obviously not a Chrome release.
10 'app_shell_version': '38.1234.5678.9', 10 'app_shell_version': '38.1234.5678.9',
(...skipping 25 matching lines...) Expand all
36 '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings', 36 '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
37 'common/api/api.gyp:cast_channel_proto', 37 'common/api/api.gyp:cast_channel_proto',
38 'extensions.gyp:extensions_browser', 38 'extensions.gyp:extensions_browser',
39 'extensions.gyp:extensions_common', 39 'extensions.gyp:extensions_common',
40 'extensions.gyp:extensions_renderer', 40 'extensions.gyp:extensions_renderer',
41 'extensions.gyp:extensions_shell_and_test_pak', 41 'extensions.gyp:extensions_shell_and_test_pak',
42 'extensions.gyp:extensions_test_support', 42 'extensions.gyp:extensions_test_support',
43 'extensions.gyp:extensions_utility', 43 'extensions.gyp:extensions_utility',
44 'extensions_resources.gyp:extensions_resources', 44 'extensions_resources.gyp:extensions_resources',
45 'extensions_strings.gyp:extensions_strings', 45 'extensions_strings.gyp:extensions_strings',
46 # Only needed at runtime.
47 '../third_party/mesa/mesa.gyp:osmesa',
48 ], 46 ],
49 # Needed for third_party libraries like leveldb. 47 # Needed for third_party libraries like leveldb.
50 'include_dirs': [ 48 'include_dirs': [
51 '..', 49 '..',
52 ], 50 ],
53 'sources': [ 51 'sources': [
54 '<@(extensions_unittests_sources)', 52 '<@(extensions_unittests_sources)',
55 ], 53 ],
56 # Disable c4267 warnings until we fix size_t to int truncations. 54 # Disable c4267 warnings until we fix size_t to int truncations.
57 'msvs_disabled_warnings': [ 4267, ], 55 'msvs_disabled_warnings': [ 4267, ],
(...skipping 22 matching lines...) Expand all
80 '<(DEPTH)/components/components.gyp:guest_view_browser', 78 '<(DEPTH)/components/components.gyp:guest_view_browser',
81 '<(DEPTH)/components/components.gyp:guest_view_renderer', 79 '<(DEPTH)/components/components.gyp:guest_view_renderer',
82 '<(DEPTH)/components/components.gyp:guest_view_test_support', 80 '<(DEPTH)/components/components.gyp:guest_view_test_support',
83 '<(DEPTH)/content/content.gyp:content_app_both', 81 '<(DEPTH)/content/content.gyp:content_app_both',
84 '<(DEPTH)/content/content_shell_and_tests.gyp:content_browser_test_suppo rt', 82 '<(DEPTH)/content/content_shell_and_tests.gyp:content_browser_test_suppo rt',
85 '<(DEPTH)/content/content_shell_and_tests.gyp:test_support_content', 83 '<(DEPTH)/content/content_shell_and_tests.gyp:test_support_content',
86 '<(DEPTH)/device/bluetooth/bluetooth.gyp:device_bluetooth_mocks', 84 '<(DEPTH)/device/bluetooth/bluetooth.gyp:device_bluetooth_mocks',
87 '<(DEPTH)/device/usb/usb.gyp:device_usb_mocks', 85 '<(DEPTH)/device/usb/usb.gyp:device_usb_mocks',
88 '<(DEPTH)/testing/gmock.gyp:gmock', 86 '<(DEPTH)/testing/gmock.gyp:gmock',
89 '<(DEPTH)/testing/gtest.gyp:gtest', 87 '<(DEPTH)/testing/gtest.gyp:gtest',
90 # Only needed at runtime.
91 '../third_party/mesa/mesa.gyp:osmesa',
92 ], 88 ],
93 'defines': [ 89 'defines': [
94 'HAS_OUT_OF_PROC_TEST_RUNNER', 90 'HAS_OUT_OF_PROC_TEST_RUNNER',
95 ], 91 ],
96 'sources': [ 92 'sources': [
97 '<@(extensions_browsertests_sources)', 93 '<@(extensions_browsertests_sources)',
98 ], 94 ],
99 'conditions': [ 95 'conditions': [
100 ['OS=="win" and win_use_allocator_shim==1', { 96 ['OS=="win" and win_use_allocator_shim==1', {
101 'dependencies': [ 97 'dependencies': [
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
150 'dependencies': [ 146 'dependencies': [
151 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 147 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
152 ], 148 ],
153 }], 149 }],
154 ], 150 ],
155 } 151 }
156 ], 152 ],
157 }], 153 }],
158 ], 154 ],
159 } 155 }
OLDNEW
« no previous file with comments | « content/content_tests.gypi ('k') | extensions/shell/app_shell.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698