diff options
| author | thakis <thakis@chromium.org> | 2016-03-04 13:53:33 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-04 21:55:14 +0000 |
| commit | f90f632aa4e1fc9750ea41a9f6ebdee1240aa678 (patch) | |
| tree | 5320eb9c3416294d0961654dc5e5ec5bc72e49d8 | |
| parent | 368a1007f97c81c0d0a8e15a8affdcdd429dad5a (diff) | |
| download | chromium_src-f90f632aa4e1fc9750ea41a9f6ebdee1240aa678.zip chromium_src-f90f632aa4e1fc9750ea41a9f6ebdee1240aa678.tar.gz chromium_src-f90f632aa4e1fc9750ea41a9f6ebdee1240aa678.tar.bz2 | |
roll gyp ed163ce233:61259d585c
61259d5 ninja/win: Use qualified paths for precompiled headers.
1950f67 Xcode-ninja: Add excluded files to the project sources_for_indexing.xcodeproj
d84fed2 Fix tests with Xcode 7.
0cd47bf Make login.keychain and 'Provisioning Profiles' symlinks.
BUG=none
TBR=scottmg
Review URL: https://codereview.chromium.org/1766033002
Cr-Commit-Position: refs/heads/master@{#379373}
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | build/win_precompile.gypi | 2 | ||||
| -rw-r--r-- | third_party/WebKit/Source/build/win/precompile.gypi | 2 |
3 files changed, 3 insertions, 3 deletions
@@ -149,7 +149,7 @@ deps = { Var('chromium_git') + '/external/snappy.git' + '@' + '762bb32f0c9d2f31ba4958c7c0933d22e80c20bf', 'src/tools/gyp': - Var('chromium_git') + '/external/gyp.git' + '@' + 'ed163ce233f76a950dce1751ac851dbe4b1c00cc', + Var('chromium_git') + '/external/gyp.git' + '@' + '61259d585ce99d9de8b35188cd0025bdbcb58411', 'src/tools/swarming_client': Var('chromium_git') + '/external/swarming.client.git' + '@' + Var('swarming_revision'), diff --git a/build/win_precompile.gypi b/build/win_precompile.gypi index fb86076..45a0afc 100644 --- a/build/win_precompile.gypi +++ b/build/win_precompile.gypi @@ -11,7 +11,7 @@ 'conditions': [ ['OS=="win" and chromium_win_pch==1', { 'target_defaults': { - 'msvs_precompiled_header': '<(DEPTH)/build/precompile.h', + 'msvs_precompiled_header': 'build/precompile.h', 'msvs_precompiled_source': '<(DEPTH)/build/precompile.cc', 'sources': ['<(DEPTH)/build/precompile.cc'], } diff --git a/third_party/WebKit/Source/build/win/precompile.gypi b/third_party/WebKit/Source/build/win/precompile.gypi index 8cb3a9e..02dd3c7 100644 --- a/third_party/WebKit/Source/build/win/precompile.gypi +++ b/third_party/WebKit/Source/build/win/precompile.gypi @@ -33,7 +33,7 @@ 'conditions': [ ['OS=="win" and chromium_win_pch==1', { 'target_defaults': { - 'msvs_precompiled_header': '<(DEPTH)/third_party/WebKit/Source/build/win/Precompile.h', + 'msvs_precompiled_header': 'third_party/WebKit/Source/build/win/Precompile.h', 'msvs_precompiled_source': '<(DEPTH)/third_party/WebKit/Source/build/win/Precompile.cpp', 'sources': ['<(DEPTH)/third_party/WebKit/Source/build/win/Precompile.cpp'], } |