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 145 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 156 'ProgramDatabaseFile': '$(OutDir)\\initial\\chrome_dll.pdb ', | 156 'ProgramDatabaseFile': '$(OutDir)\\initial\\chrome_dll.pdb ', |
| 157 'OutputFile': '$(OutDir)\\initial\\chrome.dll', | 157 'OutputFile': '$(OutDir)\\initial\\chrome.dll', |
| 158 }], ['incremental_chrome_dll==1', { | 158 }], ['incremental_chrome_dll==1', { |
| 159 'OutputFile': '$(OutDir)\\initial\\chrome.dll', | 159 'OutputFile': '$(OutDir)\\initial\\chrome.dll', |
| 160 'UseLibraryDependencyInputs': "true", | 160 'UseLibraryDependencyInputs': "true", |
| 161 }], | 161 }], |
| 162 ], | 162 ], |
| 163 }, | 163 }, |
| 164 }, | 164 }, |
| 165 'conditions': [ | 165 'conditions': [ |
| 166 ['buildtype=="Official" and branding=="Chrome"', { | |
| 167 'copies': [ | |
| 168 { | |
| 169 'destination': '<(PRODUCT_DIR)/default_apps', | |
|
Mark Mentovai
2011/09/01 20:53:38
Why do you need to copy things to <(PRODUCT_DIR)/d
SteveT
2011/09/01 21:19:57
This is the expected location for win, according t
| |
| 170 'files': [ | |
| 171 'browser/resources/default_apps/gmail.crx', | |
| 172 'browser/resources/default_apps/youtube.crx', | |
| 173 ], | |
| 174 }, | |
| 175 ], | |
| 176 }], | |
| 166 ['incremental_chrome_dll==1 and optimize_with_syzygy==0', { | 177 ['incremental_chrome_dll==1 and optimize_with_syzygy==0', { |
| 167 # Linking to a different directory and then hardlinking back | 178 # Linking to a different directory and then hardlinking back |
| 168 # to OutDir is a workaround to avoid having the .ilk for | 179 # to OutDir is a workaround to avoid having the .ilk for |
| 169 # chrome.exe and chrome.dll conflicting. See crbug.com/92528 | 180 # chrome.exe and chrome.dll conflicting. See crbug.com/92528 |
| 170 # for more information. Done on the dll instead of the exe so | 181 # for more information. Done on the dll instead of the exe so |
| 171 # that people launching from VS don't need to modify | 182 # that people launching from VS don't need to modify |
| 172 # $(TargetPath) for the exe. | 183 # $(TargetPath) for the exe. |
| 173 'msvs_postbuild': 'tools\\build\\win\\hardlink_failsafe.bat $( OutDir)\\initial\\chrome.dll $(OutDir)\\chrome.dll' | 184 'msvs_postbuild': 'tools\\build\\win\\hardlink_failsafe.bat $( OutDir)\\initial\\chrome.dll $(OutDir)\\chrome.dll' |
| 174 }] | 185 }] |
| 175 ] | 186 ] |
| (...skipping 407 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 583 'conditions': [ | 594 'conditions': [ |
| 584 ['debug_devtools!=0', { | 595 ['debug_devtools!=0', { |
| 585 'files': [ | 596 'files': [ |
| 586 '<(PRODUCT_DIR)/resources/inspector', | 597 '<(PRODUCT_DIR)/resources/inspector', |
| 587 ], | 598 ], |
| 588 }], | 599 }], |
| 589 ], | 600 ], |
| 590 }, | 601 }, |
| 591 ], | 602 ], |
| 592 'conditions': [ | 603 'conditions': [ |
| 604 ['buildtype=="Official" and branding=="Chrome"', { | |
| 605 'copies': [ | |
| 606 { | |
| 607 'destination': | |
| 608 '<(PRODUCT_DIR)/$(CONTENTS_FOLDER_PATH)/Default Apps', | |
|
Mark Mentovai
2011/09/01 20:53:38
I commented in 7811020 about this. I don’t think t
SteveT
2011/09/01 21:19:57
Discussed with Cait. I thought they had implemente
| |
| 609 'files': [ | |
| 610 'browser/resources/default_apps/gmail.crx', | |
| 611 'browser/resources/default_apps/youtube.crx', | |
| 612 ], | |
| 613 }, | |
| 614 ], | |
| 615 }], | |
| 593 ['mac_breakpad==1', { | 616 ['mac_breakpad==1', { |
| 594 'variables': { | 617 'variables': { |
| 595 # A real .dSYM is needed for dump_syms to operate on. | 618 # A real .dSYM is needed for dump_syms to operate on. |
| 596 'mac_real_dsym': 1, | 619 'mac_real_dsym': 1, |
| 597 }, | 620 }, |
| 598 'sources': [ | 621 'sources': [ |
| 599 'app/breakpad_mac.mm', | 622 'app/breakpad_mac.mm', |
| 600 'app/breakpad_mac.h', | 623 'app/breakpad_mac.h', |
| 601 ], | 624 ], |
| 602 'dependencies': [ | 625 'dependencies': [ |
| (...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 749 'LinkIncremental': '<(msvs_debug_link_nonincremental)', | 772 'LinkIncremental': '<(msvs_debug_link_nonincremental)', |
| 750 }, | 773 }, |
| 751 }, | 774 }, |
| 752 }, | 775 }, |
| 753 }, | 776 }, |
| 754 }, # target chrome_dll | 777 }, # target chrome_dll |
| 755 ], | 778 ], |
| 756 }], | 779 }], |
| 757 ], | 780 ], |
| 758 } | 781 } |
| OLD | NEW |