diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-12-08 13:36:23 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-12-11 15:14:26 +0000 |
| commit | 1d60e86edb1cd68d12862fdff072bb53e2302fed (patch) | |
| tree | d724bb2e6dc13faa76a2bea1106a37fa9f7ebe40 | |
| parent | cd7832ee326b0c424d4ad1538efd074c86a68f9b (diff) | |
| download | qtwebengine-chromium-1d60e86edb1cd68d12862fdff072bb53e2302fed.tar.gz | |
Fix build on windows
Fix more Chromium build bugs introduced with Chromium 63
Change-Id: Idc33d97199728f6ae81ff2a5255f3e51cb8c331c
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| -rw-r--r-- | chromium/build/toolchain/win/midl.py | 6 | ||||
| -rw-r--r-- | chromium/gin/v8_initializer.cc | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/chromium/build/toolchain/win/midl.py b/chromium/build/toolchain/win/midl.py index 09fec0b8cf2..606918432d0 100644 --- a/chromium/build/toolchain/win/midl.py +++ b/chromium/build/toolchain/win/midl.py @@ -171,6 +171,12 @@ def main(arch, outdir, dynamic_guid, tlb, h, dlldata, iid, proxy, idl, *flags): if sys.platform != 'win32': return 0 + # Unless you have an exact copy of the Google machine were the + # files were generated, we have to stop here as well. + # FIXME: Just use the generated files instead of the prebuilt ones, + # and do no pointless diff comparison. + return 0 + # On Windows, run midl.exe on the input and check that its outputs are # identical to the checked-in outputs (after possibly replacing their main # class guid). diff --git a/chromium/gin/v8_initializer.cc b/chromium/gin/v8_initializer.cc index e4ff07ffd84..ac2cf9de42d 100644 --- a/chromium/gin/v8_initializer.cc +++ b/chromium/gin/v8_initializer.cc @@ -150,7 +150,7 @@ base::PlatformFile OpenV8File(const char* file_name, } } else if (file.error_details() != base::File::FILE_ERROR_IN_USE) { result = OpenV8FileResult::FAILED_OTHER; -#ifdef OS_WIN +#if defined(OS_WIN) && defined(V8_USE_EXTERNAL_STARTUP_DATA) // TODO(oth): temporary diagnostics for http://crbug.com/479537 std::string narrow(kNativesFileName); base::FilePath::StringType nativesBlob(narrow.begin(), narrow.end()); |