Commit e531fbdc authored by Nico Weber's avatar Nico Weber

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
R=scottmg@chromium.org
TBR=scottmg

Committed: https://crrev.com/f90f632aa4e1fc9750ea41a9f6ebdee1240aa678
Cr-Commit-Position: refs/heads/master@{#379373}

Committed: https://chromium.googlesource.com/chromium/src/+/bcc0a572a0388ec650894017b0848509ee61e79a

Review URL: https://codereview.chromium.org/1766033002 .

Cr-Commit-Position: refs/heads/master@{#379555}
parent c295ef28
......@@ -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'),
......
......@@ -11,10 +11,11 @@
'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'],
'include_dirs': [ '<(DEPTH)' ],
}
}],
}],
],
}
......@@ -33,9 +33,10 @@
'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'],
'include_dirs': [ '<(DEPTH)' ],
}
}],
],
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment