summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorortuno <ortuno@chromium.org>2016-03-04 15:27:15 -0800
committerCommit bot <commit-bot@chromium.org>2016-03-04 23:28:39 +0000
commit765e7b178b46af51727af1972fa08e1fd902f08a (patch)
treeae6712daa8a5bc7d50afeda6f2126771659f0c79
parentf088ead93c91d0642185fab3d6c083845005bb9c (diff)
downloadchromium_src-765e7b178b46af51727af1972fa08e1fd902f08a.zip
chromium_src-765e7b178b46af51727af1972fa08e1fd902f08a.tar.gz
chromium_src-765e7b178b46af51727af1972fa08e1fd902f08a.tar.bz2
Revert of roll gyp ed163ce233:61259d585c (patchset #2 id:20001 of https://codereview.chromium.org/1766033002/ )
Reason for revert: win trunk bot started failing after this patch: [45/14742] CXX obj\third_party\angle\src\libGLESv2\libGLESv2.entry_points_gles_2_0.obj FAILED: ninja -t msvc -e environment.x86 -- "C:\b\depot_tools\win_toolchain\vs2013_files\4087e065abebdca6dbd0caca2910c6718d2ec67f\VC\bin\amd64_x86\cl.exe" /nologo /showIncludes /FC @obj\third_party\webkit\source\build\win\blink_heap_asm_stubs.precompile.obj.rsp /c ..\..\third_party\WebKit\Source\build\win\Precompile.cpp /Foobj\third_party\webkit\source\build\win\blink_heap_asm_stubs.precompile.obj /Fdobj\third_party\WebKit\Source\platform\blink_heap_asm_stubs.cc.pdb c:\b\build\slave\win_trunk\build\src\third_party\webkit\source\build\win\precompile.cpp : fatal error C1083: Cannot open include file: 'third_party/WebKit/Source/build/win/Precompile.h': No such file or directory FAILED: ninja -t msvc -e environment.x86 -- "C:\b\depot_tools\win_toolchain\vs2013_files\4087e065abebdca6dbd0caca2910c6718d2ec67f\VC\bin\amd64_x86\cl.exe" /nologo /showIncludes /FC @obj\build\harfbuzz-ng.precompile.obj.rsp /c ..\..\build\precompile.cc /Foobj\build\harfbuzz-ng.precompile.obj /Fdobj\third_party\harfbuzz-ng\harfbuzz-ng.cc.pdb c:\b\build\slave\win_trunk\build\src\build\precompile.cc : fatal error C1083: Cannot open include file: 'build/precompile.h': No such file or directory ninja: build stopped: subcommand failed. Builder: https://uberchromegw.corp.google.com/i/official.desktop.continuous/builders/win%20trunk Job: https://uberchromegw.corp.google.com/i/official.desktop.continuous/builders/win%20trunk/builds/26144 Logs:https://uberchromegw.corp.google.com/i/official.desktop.continuous/builders/win%20trunk/builds/26144/steps/compile/logs/stdio Original issue's description: > 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 > > Committed: https://crrev.com/f90f632aa4e1fc9750ea41a9f6ebdee1240aa678 > Cr-Commit-Position: refs/heads/master@{#379373} TBR=scottmg@chromium.org,thakis@chromium.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=none Review URL: https://codereview.chromium.org/1759323004 Cr-Commit-Position: refs/heads/master@{#379392}
-rw-r--r--DEPS2
-rw-r--r--build/win_precompile.gypi2
-rw-r--r--third_party/WebKit/Source/build/win/precompile.gypi2
3 files changed, 3 insertions, 3 deletions
diff --git a/DEPS b/DEPS
index 63a8017..ed653e0 100644
--- a/DEPS
+++ b/DEPS
@@ -149,7 +149,7 @@ deps = {
Var('chromium_git') + '/external/snappy.git' + '@' + '762bb32f0c9d2f31ba4958c7c0933d22e80c20bf',
'src/tools/gyp':
- Var('chromium_git') + '/external/gyp.git' + '@' + '61259d585ce99d9de8b35188cd0025bdbcb58411',
+ Var('chromium_git') + '/external/gyp.git' + '@' + 'ed163ce233f76a950dce1751ac851dbe4b1c00cc',
'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 45a0afc..fb86076 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': 'build/precompile.h',
+ 'msvs_precompiled_header': '<(DEPTH)/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 02dd3c7..8cb3a9e 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': 'third_party/WebKit/Source/build/win/Precompile.h',
+ 'msvs_precompiled_header': '<(DEPTH)/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'],
}