Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright 2013 The Chromium Authors. All rights reserved. | 1 # Copyright 2013 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 { | 5 { |
| 6 'targets': [ | 6 'targets': [ |
| 7 { | 7 { |
| 8 'target_name': 'apps', | 8 'target_name': 'apps', |
| 9 'type': 'static_library', | 9 'type': 'static_library', |
| 10 'variables': { 'enable_wexit_time_destructors': 1, }, | 10 'variables': { 'enable_wexit_time_destructors': 1, }, |
| (...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 144 ], | 144 ], |
| 145 'outputs': [ | 145 'outputs': [ |
| 146 '<(PRODUCT_DIR)/app_shell.pak', | 146 '<(PRODUCT_DIR)/app_shell.pak', |
| 147 ], | 147 ], |
| 148 'action': ['python', '<(repack_path)', '<@(_outputs)', | 148 'action': ['python', '<(repack_path)', '<@(_outputs)', |
| 149 '<@(pak_inputs)'], | 149 '<@(pak_inputs)'], |
| 150 }, | 150 }, |
| 151 ], | 151 ], |
| 152 }, | 152 }, |
| 153 { | 153 { |
| 154 'target_name': 'app_shell', | 154 'target_name': 'app_shell_lib', |
| 155 'type': 'executable', | 155 'type': 'static_library', |
| 156 'defines!': ['CONTENT_IMPLEMENTATION'], | 156 'defines!': ['CONTENT_IMPLEMENTATION'], |
| 157 'variables': { | 157 'variables': { |
| 158 'chromium_code': 1, | 158 'chromium_code': 1, |
| 159 }, | 159 }, |
| 160 'dependencies': [ | 160 'dependencies': [ |
| 161 'app_shell_pak', | 161 'app_shell_pak', |
| 162 'apps', | 162 'apps', |
| 163 'test_support_common', | 163 'test_support_common', |
| 164 '../base/base.gyp:base', | 164 '../base/base.gyp:base', |
| 165 '../base/base.gyp:base_prefs_test_support', | 165 '../base/base.gyp:base_prefs_test_support', |
| 166 '../content/content.gyp:content', | 166 '../content/content.gyp:content', |
| 167 '../content/content_shell_and_tests.gyp:content_shell_lib', | 167 '../content/content_shell_and_tests.gyp:content_shell_lib', |
| 168 '../skia/skia.gyp:skia', | 168 '../skia/skia.gyp:skia', |
| 169 '../ui/views/views.gyp:views', | 169 '../ui/views/views.gyp:views', |
| 170 '../ui/wm/wm.gyp:wm_test_support', | 170 '../ui/wm/wm.gyp:wm_test_support', |
| 171 ], | 171 ], |
| 172 'include_dirs': [ | 172 'include_dirs': [ |
| 173 '..', | 173 '..', |
| 174 ], | 174 ], |
| 175 'sources': [ | 175 'sources': [ |
| 176 'shell/app/shell_main_delegate.cc', | 176 'shell/app/shell_main_delegate.cc', |
| 177 'shell/app/shell_main_delegate.h', | 177 'shell/app/shell_main_delegate.h', |
| 178 'shell/app/shell_main.cc', | |
| 179 'shell/browser/shell_app_sorting.cc', | 178 'shell/browser/shell_app_sorting.cc', |
| 180 'shell/browser/shell_app_sorting.h', | 179 'shell/browser/shell_app_sorting.h', |
| 181 'shell/browser/shell_app_window_delegate.cc', | 180 'shell/browser/shell_app_window_delegate.cc', |
| 182 'shell/browser/shell_app_window_delegate.h', | 181 'shell/browser/shell_app_window_delegate.h', |
| 183 'shell/browser/shell_apps_client.cc', | 182 'shell/browser/shell_apps_client.cc', |
| 184 'shell/browser/shell_apps_client.h', | 183 'shell/browser/shell_apps_client.h', |
| 185 'shell/browser/shell_browser_context.cc', | 184 'shell/browser/shell_browser_context.cc', |
| 186 'shell/browser/shell_browser_context.h', | 185 'shell/browser/shell_browser_context.h', |
| 187 'shell/browser/shell_browser_main_parts.cc', | 186 'shell/browser/shell_browser_main_parts.cc', |
| 188 'shell/browser/shell_browser_main_parts.h', | 187 'shell/browser/shell_browser_main_parts.h', |
| (...skipping 21 matching lines...) Expand all Loading... | |
| 210 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS | 209 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS |
| 211 }, | 210 }, |
| 212 }, | 211 }, |
| 213 'msvs_large_pdb': 1, | 212 'msvs_large_pdb': 1, |
| 214 'dependencies': [ | 213 'dependencies': [ |
| 215 '../sandbox/sandbox.gyp:sandbox', | 214 '../sandbox/sandbox.gyp:sandbox', |
| 216 ], | 215 ], |
| 217 }], | 216 }], |
| 218 ], | 217 ], |
| 219 }, | 218 }, |
| 219 { | |
| 220 'target_name': 'app_shell', | |
| 221 'type': 'executable', | |
| 222 'defines!': ['CONTENT_IMPLEMENTATION'], | |
| 223 'variables': { | |
| 224 'chromium_code': 1, | |
| 225 }, | |
| 226 'dependencies': [ | |
| 227 'app_shell_lib', | |
| 228 'app_shell_pak', | |
| 229 ], | |
| 230 'include_dirs': [ | |
| 231 '..', | |
| 232 ], | |
| 233 'sources': [ | |
| 234 'shell/app/shell_main.cc', | |
| 235 ], | |
| 236 }, | |
| 237 { | |
| 238 'target_name': 'app_shell_browsertests', | |
|
James Cook
2014/03/20 00:00:35
nit: I'm not sure how we name these. Should it be
Yoyo Zhou
2014/03/20 21:17:30
I couldn't decide between app_shell_tests and apps
jam
2014/03/20 23:43:22
+1, it's good to have a convention of using browse
| |
| 239 'type': '<(gtest_target_type)', | |
| 240 'variables': { | |
| 241 'chromium_code': 1, | |
| 242 }, | |
| 243 'dependencies': [ | |
| 244 'app_shell_lib', | |
| 245 # TODO(yoz): find the right deps | |
| 246 '../base/base.gyp:test_support_base', | |
| 247 '../content/content.gyp:content_app_both', | |
| 248 '../content/content_shell_and_tests.gyp:content_browser_test_support ', | |
| 249 '../content/content_shell_and_tests.gyp:test_support_content', | |
| 250 '../testing/gtest.gyp:gtest', | |
| 251 ], | |
| 252 'defines': [ | |
| 253 'HAS_OUT_OF_PROC_TEST_RUNNER', | |
| 254 ], | |
| 255 'sources': [ | |
| 256 # TODO(yoz): Refactor once we have a second test target. | |
| 257 'test/app_shell_test.h', | |
| 258 'test/app_shell_test.cc', | |
| 259 'test/apps_test_launcher_delegate.cc', | |
| 260 'test/apps_test_launcher_delegate.h', | |
| 261 'test/apps_test_suite_base.h', | |
| 262 'test/apps_test_suite_base.cc', | |
| 263 'test/apps_tests_main.cc', | |
| 264 ], | |
| 265 }, | |
| 220 ], # targets | 266 ], # targets |
| 221 }], # chromeos==1 | 267 }], # chromeos==1 or linux aura or win aura |
| 222 ], # conditions | 268 ], # conditions |
| 223 } | 269 } |
| OLD | NEW |