| OLD | NEW |
| 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 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 'conditions': [ | 5 'conditions': [ |
| 6 # Dummy target to allow chrome to require chrome_dll to build | 6 # Dummy target to allow chrome to require chrome_dll to build |
| 7 # without actually linking to the library | 7 # without actually linking to the library |
| 8 ['OS=="mac"', { | 8 ['OS=="mac"', { |
| 9 'targets': [ | 9 'targets': [ |
| 10 { | 10 { |
| (...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 115 'app/chrome_main_delegate.cc', | 115 'app/chrome_main_delegate.cc', |
| 116 'app/chrome_main_delegate.h', | 116 'app/chrome_main_delegate.h', |
| 117 'app/chrome_main_mac.h', | 117 'app/chrome_main_mac.h', |
| 118 'app/chrome_main_mac.mm', | 118 'app/chrome_main_mac.mm', |
| 119 'app/delay_load_hook_win.cc', | 119 'app/delay_load_hook_win.cc', |
| 120 'app/delay_load_hook_win.h', | 120 'app/delay_load_hook_win.h', |
| 121 ], | 121 ], |
| 122 'dependencies': [ | 122 'dependencies': [ |
| 123 '<@(chromium_browser_dependencies)', | 123 '<@(chromium_browser_dependencies)', |
| 124 'chrome_features.gyp:chrome_common_features', | 124 'chrome_features.gyp:chrome_common_features', |
| 125 'policy_path_parser', |
| 125 '../content/content.gyp:content_app_browser', | 126 '../content/content.gyp:content_app_browser', |
| 126 ], | 127 ], |
| 127 'conditions': [ | 128 'conditions': [ |
| 128 ['OS=="win"', { | 129 ['OS=="win"', { |
| 129 'dependencies': [ | 130 'dependencies': [ |
| 130 '<(DEPTH)/chrome_elf/chrome_elf.gyp:chrome_elf', | 131 '<(DEPTH)/chrome_elf/chrome_elf.gyp:chrome_elf', |
| 131 ], | |
| 132 }], | |
| 133 ['OS=="win" and configuration_policy==1', { | |
| 134 'dependencies': [ | |
| 135 '<(DEPTH)/components/components.gyp:policy', | 132 '<(DEPTH)/components/components.gyp:policy', |
| 136 ], | 133 ], |
| 137 }], | 134 }], |
| 138 ['use_aura==1', { | 135 ['use_aura==1', { |
| 139 'dependencies': [ | 136 'dependencies': [ |
| 140 '../ui/compositor/compositor.gyp:compositor', | 137 '../ui/compositor/compositor.gyp:compositor', |
| 141 ], | 138 ], |
| 142 }], | 139 }], |
| 143 ['OS=="win" and target_arch=="ia32"', { | 140 ['OS=="win" and target_arch=="ia32"', { |
| 144 # Add a dependency to custom import library for user32 delay | 141 # Add a dependency to custom import library for user32 delay |
| (...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 356 'CHROME_MULTIPLE_DLL_CHILD', | 353 'CHROME_MULTIPLE_DLL_CHILD', |
| 357 ], | 354 ], |
| 358 'sources': [ | 355 'sources': [ |
| 359 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/chrome_dll_version.rc', | 356 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/chrome_dll_version.rc', |
| 360 'app/chrome_main.cc', | 357 'app/chrome_main.cc', |
| 361 'app/chrome_main_delegate.cc', | 358 'app/chrome_main_delegate.cc', |
| 362 'app/chrome_main_delegate.h', | 359 'app/chrome_main_delegate.h', |
| 363 ], | 360 ], |
| 364 'conditions': [ | 361 'conditions': [ |
| 365 ['OS=="win"', { | 362 ['OS=="win"', { |
| 363 'dependencies': [ |
| 364 '<(DEPTH)/components/components.gyp:policy', |
| 365 ], |
| 366 'conditions': [ | 366 'conditions': [ |
| 367 ['chrome_pgo_phase!=0', { | 367 ['chrome_pgo_phase!=0', { |
| 368 # Disable Warning 4702 ("Unreachable code") for the WPO/PGO | 368 # Disable Warning 4702 ("Unreachable code") for the WPO/PGO |
| 369 # builds. Probably anything that this would catch that | 369 # builds. Probably anything that this would catch that |
| 370 # wouldn't be caught in a normal build isn't going to | 370 # wouldn't be caught in a normal build isn't going to |
| 371 # actually be a bug, so the incremental value of C4702 for | 371 # actually be a bug, so the incremental value of C4702 for |
| 372 # PGO builds is likely very small. | 372 # PGO builds is likely very small. |
| 373 'msvs_disabled_warnings': [ | 373 'msvs_disabled_warnings': [ |
| 374 4702 | 374 4702 |
| 375 ], | 375 ], |
| (...skipping 16 matching lines...) Expand all Loading... |
| 392 }], | 392 }], |
| 393 ['chrome_pgo_phase==2', { | 393 ['chrome_pgo_phase==2', { |
| 394 'msvs_settings': { | 394 'msvs_settings': { |
| 395 'VCLinkerTool': { | 395 'VCLinkerTool': { |
| 396 'LinkTimeCodeGeneration': '3', | 396 'LinkTimeCodeGeneration': '3', |
| 397 }, | 397 }, |
| 398 }, | 398 }, |
| 399 }], | 399 }], |
| 400 ] | 400 ] |
| 401 }], | 401 }], |
| 402 ['OS=="win" and configuration_policy==1', { | |
| 403 'dependencies': [ | |
| 404 '<(DEPTH)/components/components.gyp:policy', | |
| 405 ], | |
| 406 }], | |
| 407 ['configuration_policy==1', { | |
| 408 'dependencies': [ | |
| 409 'policy_path_parser', | |
| 410 ], | |
| 411 }], | |
| 412 ['enable_plugins==1', { | 402 ['enable_plugins==1', { |
| 413 'dependencies': [ | 403 'dependencies': [ |
| 414 '../pdf/pdf.gyp:pdf', | 404 '../pdf/pdf.gyp:pdf', |
| 415 ], | 405 ], |
| 416 }], | 406 }], |
| 417 ], | 407 ], |
| 418 }, # target chrome_child_dll | 408 }, # target chrome_child_dll |
| 419 ], | 409 ], |
| 420 }], | 410 }], |
| 421 ], | 411 ], |
| 422 } | 412 } |
| OLD | NEW |