OLD | NEW |
---|---|
1 { | 1 { |
2 'variables': { | 2 'variables': { |
3 # Product name is used for Mac bundle. | 3 # Product name is used for Mac bundle. |
4 'app_shell_product_name': 'App Shell', | 4 'app_shell_product_name': 'App Shell', |
5 # The version is high enough to be supported by Omaha (at least 31) | 5 # The version is high enough to be supported by Omaha (at least 31) |
6 # but fake enough to be obviously not a Chrome release. | 6 # but fake enough to be obviously not a Chrome release. |
7 'app_shell_version': '38.1234.5678.9', | 7 'app_shell_version': '38.1234.5678.9', |
8 'chromium_code': 1, | 8 'chromium_code': 1, |
9 }, | 9 }, |
10 'targets': [ | 10 'targets': [ |
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
52 'browser/api/cast_channel/cast_transport_unittest.cc', | 52 'browser/api/cast_channel/cast_transport_unittest.cc', |
53 'browser/api/cast_channel/keep_alive_delegate_unittest.cc', | 53 'browser/api/cast_channel/keep_alive_delegate_unittest.cc', |
54 'browser/api/cast_channel/logger_unittest.cc', | 54 'browser/api/cast_channel/logger_unittest.cc', |
55 'browser/api/cast_channel/test_util.cc', | 55 'browser/api/cast_channel/test_util.cc', |
56 'browser/api/cast_channel/test_util.h', | 56 'browser/api/cast_channel/test_util.h', |
57 'browser/api/declarative/declarative_rule_unittest.cc', | 57 'browser/api/declarative/declarative_rule_unittest.cc', |
58 'browser/api/declarative/deduping_factory_unittest.cc', | 58 'browser/api/declarative/deduping_factory_unittest.cc', |
59 'browser/api/declarative/rules_registry_unittest.cc', | 59 'browser/api/declarative/rules_registry_unittest.cc', |
60 'browser/api/declarative_webrequest/webrequest_condition_unittest.cc', | 60 'browser/api/declarative_webrequest/webrequest_condition_unittest.cc', |
61 'browser/api/declarative_webrequest/webrequest_condition_attribute_unitt est.cc', | 61 'browser/api/declarative_webrequest/webrequest_condition_attribute_unitt est.cc', |
62 'browser/api/document_scan/document_scan_api_unittest.cc', | |
63 'browser/api/document_scan/mock_document_scan_interface.cc', | |
62 'browser/api/idle/idle_api_unittest.cc', | 64 'browser/api/idle/idle_api_unittest.cc', |
63 'browser/api/mime_handler_private/mime_handler_private_unittest.cc', | 65 'browser/api/mime_handler_private/mime_handler_private_unittest.cc', |
64 'browser/api/networking_config/networking_config_service_chromeos_unitte st.cc', | 66 'browser/api/networking_config/networking_config_service_chromeos_unitte st.cc', |
65 'browser/api/power/power_api_unittest.cc', | 67 'browser/api/power/power_api_unittest.cc', |
66 'browser/api/sockets_tcp/sockets_tcp_api_unittest.cc', | 68 'browser/api/sockets_tcp/sockets_tcp_api_unittest.cc', |
67 'browser/api/sockets_udp/sockets_udp_api_unittest.cc', | 69 'browser/api/sockets_udp/sockets_udp_api_unittest.cc', |
68 'browser/api/storage/settings_quota_unittest.cc', | 70 'browser/api/storage/settings_quota_unittest.cc', |
69 'browser/api/storage/storage_api_unittest.cc', | 71 'browser/api/storage/storage_api_unittest.cc', |
70 'browser/api/storage/storage_frontend_unittest.cc', | 72 'browser/api/storage/storage_frontend_unittest.cc', |
71 'browser/api/web_request/form_data_parser_unittest.cc', | 73 'browser/api/web_request/form_data_parser_unittest.cc', |
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
153 'utility/unpacker_unittest.cc', | 155 'utility/unpacker_unittest.cc', |
154 ], | 156 ], |
155 # Disable c4267 warnings until we fix size_t to int truncations. | 157 # Disable c4267 warnings until we fix size_t to int truncations. |
156 'msvs_disabled_warnings': [ 4267, ], | 158 'msvs_disabled_warnings': [ 4267, ], |
157 'conditions': [ | 159 'conditions': [ |
158 ['OS=="win" and win_use_allocator_shim==1', { | 160 ['OS=="win" and win_use_allocator_shim==1', { |
159 'dependencies': [ | 161 'dependencies': [ |
160 '../base/allocator/allocator.gyp:allocator', | 162 '../base/allocator/allocator.gyp:allocator', |
161 ], | 163 ], |
162 }], | 164 }], |
165 ['chromeos==1', { | |
166 'dependencies': [ | |
167 '<(DEPTH)/chromeos/chromeos.gyp:chromeos_test_support', | |
168 ], | |
169 'sources': [ | |
170 'browser/api/document_scan/document_scan_interface_chromeos_unittest .cc', | |
James Cook
2015/02/05 19:02:59
Either put this in the sources list above (I think
babu
2015/02/05 21:34:03
Done. filename rules seems to be taking care the f
| |
171 ], | |
172 }], | |
163 ], | 173 ], |
164 }, | 174 }, |
165 { | 175 { |
166 # GN version: //extensions:extensions_browsertests | 176 # GN version: //extensions:extensions_browsertests |
167 'target_name': 'extensions_browsertests', | 177 'target_name': 'extensions_browsertests', |
168 'type': '<(gtest_target_type)', | 178 'type': '<(gtest_target_type)', |
169 'dependencies': [ | 179 'dependencies': [ |
170 'extensions.gyp:extensions_test_support', | 180 'extensions.gyp:extensions_test_support', |
171 'shell/app_shell.gyp:app_shell_lib', | 181 'shell/app_shell.gyp:app_shell_lib', |
172 # TODO(yoz): find the right deps | 182 # TODO(yoz): find the right deps |
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
247 '../build/isolate.gypi', | 257 '../build/isolate.gypi', |
248 ], | 258 ], |
249 'sources': [ | 259 'sources': [ |
250 'extensions_browsertests.isolate', | 260 'extensions_browsertests.isolate', |
251 ], | 261 ], |
252 }, | 262 }, |
253 ], | 263 ], |
254 }], | 264 }], |
255 ], | 265 ], |
256 } | 266 } |
OLD | NEW |