Commit 686bec11 authored by kylechar's avatar kylechar Committed by Commit Bot

Fix blink precompiled header names.

Fix file names for precompiled headers in blink. The case mismatch of
build/win/Precompile.h vs build/win/precompile.h was causing errors when
cross compiling for Windows on Linux. Also fix some mangled files.

Bug: 768828
Change-Id: I56d657a7cbd79dcdd021785fee9d4e9e8d402a9f
Reviewed-on: https://chromium-review.googlesource.com/1005276
Commit-Queue: kylechar <kylechar@chromium.org>
Reviewed-by: default avatarNico Weber <thakis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#549545}
parent 76fa1a1a
...@@ -65,19 +65,19 @@ config("blink_core_pch") { ...@@ -65,19 +65,19 @@ config("blink_core_pch") {
# This is a string rather than a file GN knows about. It has to match # This is a string rather than a file GN knows about. It has to match
# exactly what's in the /FI flag below, and what might appear in the # exactly what's in the /FI flag below, and what might appear in the
# source code in quotes for an #include directive. # source code in quotes for an #include directive.
precompiled_header = rebase_path("precompile_-core.h", root_build_dir) precompiled_header = rebase_path("precompile_core.h", root_build_dir)
# This is a file that GN will compile with the above header. It will be # This is a file that GN will compile with the above header. It will be
# implicitly added to the sources (potentially multiple times, with one # implicitly added to the sources (potentially multiple times, with one
# variant for each language used in the target). # variant for each language used in the target).
precompiled_source = precompiled_source =
"//third_party/blink/renderer/core/win/precompile_-core.cc" "//third_party/blink/renderer/core/win/precompile_core.cc"
# Force include the header. # Force include the header.
cflags = [ "/FI$precompiled_header" ] cflags = [ "/FI$precompiled_header" ]
} else if (is_mac) { } else if (is_mac) {
precompiled_source = precompiled_source =
"//third_party/blink/renderer/core/precompile_-core.h" "//third_party/blink/renderer/core/precompile_core.h"
} }
} }
} }
......
...@@ -8,9 +8,9 @@ ...@@ -8,9 +8,9 @@
#define PrecompileCore_h_ #define PrecompileCore_h_
#if defined(_MSC_VER) #if defined(_MSC_VER)
#include "build/win/Precompile.h" #include "build/win/precompile.h"
#elif defined(__APPLE__) #elif defined(__APPLE__)
#include "build/mac/Prefix.h" #include "build/mac/prefix.h"
#else #else
#error implement #error implement
#endif #endif
......
...@@ -246,19 +246,19 @@ config("blink_platform_pch") { ...@@ -246,19 +246,19 @@ config("blink_platform_pch") {
# This is a string rather than a file GN knows about. It has to match # This is a string rather than a file GN knows about. It has to match
# exactly what's in the /FI flag below, and what might appear in the # exactly what's in the /FI flag below, and what might appear in the
# source code in quotes for an #include directive. # source code in quotes for an #include directive.
precompiled_header = rebase_path("precompile_-platform.h", root_build_dir) precompiled_header = rebase_path("precompile_platform.h", root_build_dir)
# This is a file that GN will compile with the above header. It will be # This is a file that GN will compile with the above header. It will be
# implicitly added to the sources (potentially multiple times, with one # implicitly added to the sources (potentially multiple times, with one
# variant for each language used in the target). # variant for each language used in the target).
precompiled_source = precompiled_source =
"//third_party/blink/renderer/platform/win/precompile_-platform.cc" "//third_party/blink/renderer/platform/win/precompile_platform.cc"
# Force include the header. # Force include the header.
cflags = [ "/FI$precompiled_header" ] cflags = [ "/FI$precompiled_header" ]
} else if (is_mac) { } else if (is_mac) {
precompiled_source = precompiled_source =
"//third_party/blink/renderer/platform/precompile_-platform.h" "//third_party/blink/renderer/platform/precompile_platform.h"
} }
} }
} }
......
...@@ -9,9 +9,9 @@ ...@@ -9,9 +9,9 @@
#define PrecompilePlatform_h_ #define PrecompilePlatform_h_
#if defined(_MSC_VER) #if defined(_MSC_VER)
#include "build/win/Precompile.h" #include "build/win/precompile.h"
#elif defined(__APPLE__) #elif defined(__APPLE__)
#include "build/mac/Prefix.h" #include "build/mac/prefix.h"
#else #else
#error implement #error implement
#endif #endif
......
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