summaryrefslogtreecommitdiffstats
path: root/chrome/chrome_dll.gypi
diff options
context:
space:
mode:
authorscottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-20 19:15:33 +0000
committerscottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-20 19:15:33 +0000
commit9e3223381bfc0f198beb5e4057adac1e79ba3284 (patch)
tree0e5294a9696559a2ae663661609593d120393d63 /chrome/chrome_dll.gypi
parent9b6e10c4e2e404dcca133a12ae451e87cb0b48c0 (diff)
downloadchromium_src-9e3223381bfc0f198beb5e4057adac1e79ba3284.zip
chromium_src-9e3223381bfc0f198beb5e4057adac1e79ba3284.tar.gz
chromium_src-9e3223381bfc0f198beb5e4057adac1e79ba3284.tar.bz2
VS2013 Update 2
As discussed in the linked bug, the toolchain2013.py script in depot_tools is no longer workable (because the update for Update 2 is supplied as a .msp that must be applied against a system-installed VS2013). As such, the Express hash here is not updated. The hash zip referenced here was built as follows: - Install VS2013 Update 2 on a clean VM - Copy DIA SDK\, VC\ - Copy DLLs from VC\redist to sys32\ and sys64\ - Copy win8sdk unchanged from previous .zip. - Delete various unused arm\ subdirectories - Delete the IDE-only Snippets, etc. subdirectories in VC\ - Patch VC\include\xtree to disable warning 4702 per request in http://crbug.com/346399 . A followup change will be to write a script that does these steps semi-automatically, hopefully for Express too, though there is the added complication of the WDK/ATL/MFC hacking required there. In particular, this script will not be useful for a dev to actually run as part of runhooks, but will be a bit useful for deployment/ documentation of the above process. In the interim there are no extremely-pressing reasons for Express users to update to Update2 that I'm aware of, so they get non-Update2 for now. R=iannucci@chromium.org BUG=372451,346399,371847,339215,350639 Review URL: https://codereview.chromium.org/284663003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@271721 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_dll.gypi')
-rw-r--r--chrome/chrome_dll.gypi24
1 files changed, 0 insertions, 24 deletions
diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi
index eb7fcc3..38ed0b5 100644
--- a/chrome/chrome_dll.gypi
+++ b/chrome/chrome_dll.gypi
@@ -108,7 +108,6 @@
'dependencies': [
# On Windows, link the dependencies (libraries) that make
# up actual Chromium functionality into this .dll.
- 'chrome_dll_pdb_workaround',
'chrome_version_resources',
'../chrome/chrome_resources.gyp:chrome_unscaled_resources',
'../crypto/crypto.gyp:crypto',
@@ -328,29 +327,6 @@
}, # target chrome_main_dll
], # targets
}], # OS=="mac" or OS=="win"
- ['OS=="win"', {
- 'targets': [
- {
- # This target is only depended upon on Windows.
- 'target_name': 'chrome_dll_pdb_workaround',
- 'type': 'static_library',
- 'sources': [ 'empty_pdb_workaround.cc' ],
- 'conditions': [
- ['fastbuild==0 or win_z7!=0', {
- 'msvs_settings': {
- 'VCCLCompilerTool': {
- # This *in the compile phase* must match the pdb name that's
- # output by the final link. See empty_pdb_workaround.cc for
- # more details.
- 'DebugInformationFormat': '3',
- 'ProgramDataBaseFileName': '<(PRODUCT_DIR)/chrome.dll.pdb',
- },
- },
- }],
- ],
- },
- ],
- }],
['chrome_multiple_dll', {
'targets': [
{