| OLD | NEW |
| 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 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 'includes': [ | 6 'includes': [ |
| 7 'app_shell.gypi', | 7 'app_shell.gypi', |
| 8 ], | 8 ], |
| 9 'variables': { | 9 'variables': { |
| 10 # Product name is used for Mac bundle. | 10 # Product name is used for Mac bundle. |
| (...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 126 ['OS=="win"', { | 126 ['OS=="win"', { |
| 127 'msvs_settings': { | 127 'msvs_settings': { |
| 128 'VCLinkerTool': { | 128 'VCLinkerTool': { |
| 129 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS | 129 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS |
| 130 }, | 130 }, |
| 131 }, | 131 }, |
| 132 'dependencies': [ | 132 'dependencies': [ |
| 133 '<(DEPTH)/sandbox/sandbox.gyp:sandbox', | 133 '<(DEPTH)/sandbox/sandbox.gyp:sandbox', |
| 134 ], | 134 ], |
| 135 }], | 135 }], |
| 136 ['OS=="win" and win_use_allocator_shim==1', { | |
| 137 'dependencies': [ | |
| 138 '<(DEPTH)/base/allocator/allocator.gyp:allocator', | |
| 139 ], | |
| 140 }], | |
| 141 ['OS=="mac"', { | 136 ['OS=="mac"', { |
| 142 'product_name': '<(app_shell_product_name)', | 137 'product_name': '<(app_shell_product_name)', |
| 143 'dependencies!': [ | 138 'dependencies!': [ |
| 144 'app_shell_lib', | 139 'app_shell_lib', |
| 145 ], | 140 ], |
| 146 'dependencies': [ | 141 'dependencies': [ |
| 147 'app_shell_framework', | 142 'app_shell_framework', |
| 148 'app_shell_helper', | 143 'app_shell_helper', |
| 149 ], | 144 ], |
| 150 'mac_bundle_resources': [ | 145 'mac_bundle_resources': [ |
| (...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 216 ], | 211 ], |
| 217 }], | 212 }], |
| 218 ['chromeos==1', { | 213 ['chromeos==1', { |
| 219 'dependencies': [ | 214 'dependencies': [ |
| 220 '<(DEPTH)/chromeos/chromeos.gyp:chromeos_test_support_without_gmock'
, | 215 '<(DEPTH)/chromeos/chromeos.gyp:chromeos_test_support_without_gmock'
, |
| 221 ], | 216 ], |
| 222 'sources': [ | 217 'sources': [ |
| 223 '<@(app_shell_unittests_sources_chromeos)', | 218 '<@(app_shell_unittests_sources_chromeos)', |
| 224 ], | 219 ], |
| 225 }], | 220 }], |
| 226 ['OS=="win" and win_use_allocator_shim==1', { | |
| 227 'dependencies': [ | |
| 228 '<(DEPTH)/base/allocator/allocator.gyp:allocator', | |
| 229 ], | |
| 230 }], | |
| 231 ], | 221 ], |
| 232 }, | 222 }, |
| 233 { | 223 { |
| 234 'target_name': 'app_shell_version_header', | 224 'target_name': 'app_shell_version_header', |
| 235 'type': 'none', | 225 'type': 'none', |
| 236 'direct_dependent_settings': { | 226 'direct_dependent_settings': { |
| 237 'include_dirs': [ | 227 'include_dirs': [ |
| 238 '<(SHARED_INTERMEDIATE_DIR)', | 228 '<(SHARED_INTERMEDIATE_DIR)', |
| 239 ], | 229 ], |
| 240 }, | 230 }, |
| (...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 411 '../../build/isolate.gypi', | 401 '../../build/isolate.gypi', |
| 412 ], | 402 ], |
| 413 'sources': [ | 403 'sources': [ |
| 414 'app_shell_unittests.isolate', | 404 'app_shell_unittests.isolate', |
| 415 ], | 405 ], |
| 416 }, | 406 }, |
| 417 ], | 407 ], |
| 418 }], | 408 }], |
| 419 ], | 409 ], |
| 420 } | 410 } |
| OLD | NEW |