diff options
author | scottmg <scottmg@chromium.org> | 2014-11-14 17:37:47 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-11-15 01:38:14 +0000 |
commit | a6675a5f1f55e66b1d6625af6225d44f5d9b0f3d (patch) | |
tree | 36a07416fac71bbac498844648a984a50ecb2162 /chrome | |
parent | 3184da05915b4dae75148ca6a890d86b1707f607 (diff) | |
download | chromium_src-a6675a5f1f55e66b1d6625af6225d44f5d9b0f3d.zip chromium_src-a6675a5f1f55e66b1d6625af6225d44f5d9b0f3d.tar.gz chromium_src-a6675a5f1f55e66b1d6625af6225d44f5d9b0f3d.tar.bz2 |
Update to VS2013 Update 4, and Windows SDK 8.1
- Disable 4996 (deprecated functions in 8.1, these don't help us because we have to run on old OSs anyway)
- Simplify Bluetooth LE header hacks (these headers are buggy in 8.0 and 8.1 SDKs, but less buggy in 8.1)
- Revert attempt to centralize toolchain hashes as it didn't work well, and made it hard to roll anyway (see 400830).
- Instead of basing C4702 (unreachable code) on Pro vs. Express, check whether it's actually disabled in the xtree header
- Remove automatic calling of Express toolchain setup script. It hasn't worked well since post VS2013 RTM because of being distributed as .msp files, and the new Community edition is relatively easy to install so can subsume that usage (that being the motivation for the 4702 change above)
- goma package for u4 is pushed
- ANGLE is switched to load d3dcompiler_47 and build against 8.1 sdk, roll included here.
Xrefs:
- https://codereview.chromium.org/719343004/
- https://chromium-review.googlesource.com/#/c/229616/
- b2/18365241
- https://codereview.chromium.org/733563003/
- https://codereview.chromium.org/732673002/
- https://codereview.chromium.org/729453004/
- https://chromereviews.googleplex.com/120597013/
BUG=311488,432748,400830
Review URL: https://codereview.chromium.org/720033003
Cr-Commit-Position: refs/heads/master@{#304329}
Diffstat (limited to 'chrome')
-rw-r--r-- | chrome/angle.isolate | 2 | ||||
-rw-r--r-- | chrome/installer/mini_installer/chrome.release | 2 | ||||
-rw-r--r-- | chrome/interactive_ui_tests.isolate | 2 | ||||
-rw-r--r-- | chrome/tools/build/win/FILES.cfg | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/chrome/angle.isolate b/chrome/angle.isolate index 151cd1b..5e8a04a 100644 --- a/chrome/angle.isolate +++ b/chrome/angle.isolate @@ -9,7 +9,7 @@ ['OS=="win"', { 'variables': { 'files': [ - '<(PRODUCT_DIR)/d3dcompiler_46.dll', + '<(PRODUCT_DIR)/d3dcompiler_47.dll', '<(PRODUCT_DIR)/libEGL.dll', '<(PRODUCT_DIR)/libGLESv2.dll', ], diff --git a/chrome/installer/mini_installer/chrome.release b/chrome/installer/mini_installer/chrome.release index d2d0a2f9..2b8fe5e 100644 --- a/chrome/installer/mini_installer/chrome.release +++ b/chrome/installer/mini_installer/chrome.release @@ -22,7 +22,7 @@ chrome.dll: %(VersionDir)s\ chrome_100_percent.pak: %(VersionDir)s\ chrome_child.dll: %(VersionDir)s\ chrome_elf.dll: %(VersionDir)s\ -d3dcompiler_46.dll: %(VersionDir)s\ +d3dcompiler_47.dll: %(VersionDir)s\ ffmpegsumo.dll: %(VersionDir)s\ icudt.dll: %(VersionDir)s\ icudtl.dat: %(VersionDir)s\ diff --git a/chrome/interactive_ui_tests.isolate b/chrome/interactive_ui_tests.isolate index 066c007..6a29163 100644 --- a/chrome/interactive_ui_tests.isolate +++ b/chrome/interactive_ui_tests.isolate @@ -83,7 +83,7 @@ 'variables': { 'files': [ '<(PRODUCT_DIR)/chrome_elf.dll', - '<(PRODUCT_DIR)/d3dcompiler_46.dll', + '<(PRODUCT_DIR)/d3dcompiler_47.dll', '<(PRODUCT_DIR)/ffmpegsumo.dll', '<(PRODUCT_DIR)/libEGL.dll', '<(PRODUCT_DIR)/libGLESv2.dll', diff --git a/chrome/tools/build/win/FILES.cfg b/chrome/tools/build/win/FILES.cfg index 6d537c2..403f1fb 100644 --- a/chrome/tools/build/win/FILES.cfg +++ b/chrome/tools/build/win/FILES.cfg @@ -362,7 +362,7 @@ FILES = [ }, # ANGLE files: { - 'filename': 'D3DCompiler_46.dll', + 'filename': 'D3DCompiler_47.dll', 'buildtype': ['dev', 'official'], }, { |