Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2011 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 'target_defaults': { | 5 'target_defaults': { |
| 6 'variables': { | 6 'variables': { |
| 7 'chrome_dll_target': 0, | 7 'chrome_dll_target': 0, |
| 8 }, | 8 }, |
| 9 'target_conditions': [ | 9 'target_conditions': [ |
| 10 ['chrome_dll_target==1', { | 10 ['chrome_dll_target==1', { |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 56 }, | 56 }, |
| 57 }], # OS=="win" | 57 }], # OS=="win" |
| 58 ], # conditions | 58 ], # conditions |
| 59 }], | 59 }], |
| 60 ], | 60 ], |
| 61 }, | 61 }, |
| 62 'conditions': [ | 62 'conditions': [ |
| 63 ['OS=="mac" or OS=="win"', { | 63 ['OS=="mac" or OS=="win"', { |
| 64 'targets': [ | 64 'targets': [ |
| 65 { | 65 { |
| 66 'target_name': 'chrome_dll', | |
| 67 'type': 'shared_library', | |
| 68 'variables': { | 66 'variables': { |
| 69 'chrome_dll_target': 1, | 67 'chrome_dll_target': 1, |
| 68 'conditions' : [ | |
| 69 ['OS=="win"', { | |
| 70 # On Windows we use build chrome_dll as an intermediate target | |
| 71 # then have a subsequent step which either optimizes it to its | |
| 72 # final location, or copies it to its final location, depending | |
| 73 # on whether or not optimize_with_syzygy==1. | |
| 74 'dll_target_name': 'chrome_dll_initial', | |
| 75 }, { | |
| 76 'dll_target_name': 'chrome_dll', | |
| 77 }], | |
| 78 ], | |
| 70 }, | 79 }, |
| 80 'target_name': '<(dll_target_name)', | |
| 81 'type': 'shared_library', | |
| 71 'dependencies': [ | 82 'dependencies': [ |
| 72 '<@(chromium_dependencies)', | 83 '<@(chromium_dependencies)', |
| 73 'app/policy/cloud_policy_codegen.gyp:policy', | 84 'app/policy/cloud_policy_codegen.gyp:policy', |
| 74 ], | 85 ], |
| 75 'conditions': [ | 86 'conditions': [ |
| 76 ['OS=="win"', { | 87 ['OS=="win"', { |
| 77 'product_name': 'chrome', | 88 'product_name': 'chrome', |
| 78 'dependencies': [ | 89 'dependencies': [ |
| 79 # On Windows, link the dependencies (libraries) that make | 90 # On Windows, link the dependencies (libraries) that make |
| 80 # up actual Chromium functionality into this .dll. | 91 # up actual Chromium functionality into this .dll. |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 126 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc', | 137 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc', |
| 127 | 138 |
| 128 # TODO(sgk): left-over from pre-gyp build, figure out | 139 # TODO(sgk): left-over from pre-gyp build, figure out |
| 129 # if we still need them and/or how to update to gyp. | 140 # if we still need them and/or how to update to gyp. |
| 130 #'app/check_dependents.bat', | 141 #'app/check_dependents.bat', |
| 131 #'app/chrome.dll.deps', | 142 #'app/chrome.dll.deps', |
| 132 ], | 143 ], |
| 133 'msvs_settings': { | 144 'msvs_settings': { |
| 134 'VCLinkerTool': { | 145 'VCLinkerTool': { |
| 135 'ImportLibrary': '$(OutDir)\\lib\\chrome_dll.lib', | 146 'ImportLibrary': '$(OutDir)\\lib\\chrome_dll.lib', |
| 136 'ProgramDatabaseFile': '$(OutDir)\\chrome_dll.pdb', | 147 # On Windows we use build chrome_dll as an intermediate target |
| 148 # then have a subsequent step which either optimizes it to its | |
| 149 # final location, or copies it to its final location, based | |
| 150 # on whether or not optimize_with_syzygy==1. | |
| 151 'ProgramDatabaseFile': '$(OutDir)\\initial\\chrome_dll.pdb', | |
|
chrisha
2011/08/03 17:16:27
Do you want this to be chrome_dll_initial.pdb as w
Roger McFarlane (Google)
2011/08/03 17:47:32
No, I retained the original basenames for the file
| |
| 152 'OutputFile': '$(OutDir)\\initial\chrome.dll', | |
|
Roger McFarlane (Google)
2011/08/03 17:47:32
Oops, that should be a double backslash between "i
| |
| 153 # This corresponds to the /PROFILE flag which ensures the PDB | |
| 154 # file contains FIXUP information. This information is used | |
| 155 # by the Syzygy optimization tool. | |
| 156 'Profile': 'true', | |
| 137 }, | 157 }, |
| 138 }, | 158 }, |
| 139 }], # OS=="win" | 159 }], # OS=="win" |
| 140 ['OS=="mac"', { | 160 ['OS=="mac"', { |
| 141 # The main browser executable's name is <(mac_product_name). | 161 # The main browser executable's name is <(mac_product_name). |
| 142 # Certain things will get confused if two modules in the | 162 # Certain things will get confused if two modules in the |
| 143 # executable share the same name, so append " Framework" to the | 163 # executable share the same name, so append " Framework" to the |
| 144 # product_name used for the framework. This will result in | 164 # product_name used for the framework. This will result in |
| 145 # a name like "Chromium Framework.framework". | 165 # a name like "Chromium Framework.framework". |
| 146 'product_name': '<(mac_product_name) Framework', | 166 'product_name': '<(mac_product_name) Framework', |
| (...skipping 565 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 712 'LinkIncremental': '<(msvs_debug_link_nonincremental)', | 732 'LinkIncremental': '<(msvs_debug_link_nonincremental)', |
| 713 }, | 733 }, |
| 714 }, | 734 }, |
| 715 }, | 735 }, |
| 716 }, | 736 }, |
| 717 }, # target chrome_dll | 737 }, # target chrome_dll |
| 718 ], | 738 ], |
| 719 }], | 739 }], |
| 720 ], | 740 ], |
| 721 } | 741 } |
| OLD | NEW |