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

Side by Side Diff: extensions/extensions_tests.gyp

Issue 1242323004: Add missing dependencies. (Closed) Base URL: https://chromium.googlesource.com/a/chromium/src.git@master
Patch Set: osmesa really need to be a dep of each exe Created 5 years, 5 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 22 matching lines...) Expand all
33 '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings', 33 '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
34 'common/api/api.gyp:cast_channel_proto', 34 'common/api/api.gyp:cast_channel_proto',
35 'extensions.gyp:extensions_browser', 35 'extensions.gyp:extensions_browser',
36 'extensions.gyp:extensions_common', 36 'extensions.gyp:extensions_common',
37 'extensions.gyp:extensions_renderer', 37 'extensions.gyp:extensions_renderer',
38 'extensions.gyp:extensions_shell_and_test_pak', 38 'extensions.gyp:extensions_shell_and_test_pak',
39 'extensions.gyp:extensions_test_support', 39 'extensions.gyp:extensions_test_support',
40 'extensions.gyp:extensions_utility', 40 'extensions.gyp:extensions_utility',
41 'extensions_resources.gyp:extensions_resources', 41 'extensions_resources.gyp:extensions_resources',
42 'extensions_strings.gyp:extensions_strings', 42 'extensions_strings.gyp:extensions_strings',
43 # Only needed at runtime.
44 '../third_party/mesa/mesa.gyp:osmesa',
43 ], 45 ],
44 # Needed for third_party libraries like leveldb. 46 # Needed for third_party libraries like leveldb.
45 'include_dirs': [ 47 'include_dirs': [
46 '..', 48 '..',
47 ], 49 ],
48 'sources': [ 50 'sources': [
49 '<@(extensions_unittests_sources)', 51 '<@(extensions_unittests_sources)',
50 ], 52 ],
51 # Disable c4267 warnings until we fix size_t to int truncations. 53 # Disable c4267 warnings until we fix size_t to int truncations.
52 'msvs_disabled_warnings': [ 4267, ], 54 'msvs_disabled_warnings': [ 4267, ],
(...skipping 22 matching lines...) Expand all
75 '<(DEPTH)/components/components.gyp:guest_view_browser', 77 '<(DEPTH)/components/components.gyp:guest_view_browser',
76 '<(DEPTH)/components/components.gyp:guest_view_renderer', 78 '<(DEPTH)/components/components.gyp:guest_view_renderer',
77 '<(DEPTH)/components/components.gyp:guest_view_test_support', 79 '<(DEPTH)/components/components.gyp:guest_view_test_support',
78 '<(DEPTH)/content/content.gyp:content_app_both', 80 '<(DEPTH)/content/content.gyp:content_app_both',
79 '<(DEPTH)/content/content_shell_and_tests.gyp:content_browser_test_suppo rt', 81 '<(DEPTH)/content/content_shell_and_tests.gyp:content_browser_test_suppo rt',
80 '<(DEPTH)/content/content_shell_and_tests.gyp:test_support_content', 82 '<(DEPTH)/content/content_shell_and_tests.gyp:test_support_content',
81 '<(DEPTH)/device/bluetooth/bluetooth.gyp:device_bluetooth_mocks', 83 '<(DEPTH)/device/bluetooth/bluetooth.gyp:device_bluetooth_mocks',
82 '<(DEPTH)/device/usb/usb.gyp:device_usb_mocks', 84 '<(DEPTH)/device/usb/usb.gyp:device_usb_mocks',
83 '<(DEPTH)/testing/gmock.gyp:gmock', 85 '<(DEPTH)/testing/gmock.gyp:gmock',
84 '<(DEPTH)/testing/gtest.gyp:gtest', 86 '<(DEPTH)/testing/gtest.gyp:gtest',
87 # Only needed at runtime.
88 '../third_party/mesa/mesa.gyp:osmesa',
85 ], 89 ],
86 'defines': [ 90 'defines': [
87 'HAS_OUT_OF_PROC_TEST_RUNNER', 91 'HAS_OUT_OF_PROC_TEST_RUNNER',
88 ], 92 ],
89 'sources': [ 93 'sources': [
90 '<@(extensions_browsertests_sources)', 94 '<@(extensions_browsertests_sources)',
91 ], 95 ],
92 'conditions': [ 96 'conditions': [
93 ['OS=="win" and win_use_allocator_shim==1', { 97 ['OS=="win" and win_use_allocator_shim==1', {
94 'dependencies': [ 98 'dependencies': [
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
143 'dependencies': [ 147 'dependencies': [
144 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 148 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
145 ], 149 ],
146 }], 150 }],
147 ], 151 ],
148 } 152 }
149 ], 153 ],
150 }], 154 }],
151 ], 155 ],
152 } 156 }
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