Commit addfa4e6 authored by Daniel Bratell's avatar Daniel Bratell Committed by Commit Bot

[jumbo] Windows build fix related to INITGUID

Generating GUID objects in a binary requires careful juggling
of includes and the define INITGUID (or the header <Initguid.h>).

Jumbo builds are not that careful so the simplest/best solution
is to remove the file doing INITGUID from jumbo compilation.
This manifested itself in jumbo fyi builders building
catalog_viewer_service.exe.

TBR=dtapuska@chromium.org

Bug: 657623
Change-Id: I1457727a0b3a68f82726a2e73c1ae3dedb06f12d
Reviewed-on: https://chromium-review.googlesource.com/955690Reviewed-by: default avatarDaniel Bratell <bratell@opera.com>
Commit-Queue: Daniel Bratell <bratell@opera.com>
Cr-Commit-Position: refs/heads/master@{#542108}
parent e330bcb6
...@@ -192,6 +192,13 @@ jumbo_component("ime") { ...@@ -192,6 +192,13 @@ jumbo_component("ime") {
"input_method_win_tsf.h", "input_method_win_tsf.h",
] ]
libs = [ "imm32.lib" ] libs = [ "imm32.lib" ]
jumbo_excluded_sources = [
# tsf_text_store.cc needs INITGUID to be defined before
# including any header to properly generate GUID objects. That
# is not guaranteed when included in a jumbo build.
"win/tsf_text_store.cc",
]
} }
if (is_mac) { if (is_mac) {
......
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