bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge webkit_set target into //WebKit/source/controller to fix deps race (issue #2339)

Browse Source
This commit is contained in:
Marshall Greenblatt
2017-12-27 13:20:12 -05:00
parent 54a015f785
commit 4ddff77339
2 changed files with 17 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
BUILD.gn
View File

@@ -231,47 +231,6 @@ group("cef") {
# libcef static target. # libcef static target.
# #
# Target for building code that accesses Blink internals. Included from the
# //third_party/WebKit/Source/web target.
source_set("webkit_set") {
sources = [
"libcef/renderer/webkit_glue.cc",
"libcef/renderer/webkit_glue.h",
]
configs += [
"libcef/features:config",
"//build/config:precompiled_headers",
# Blink-internal include paths.
"//third_party/WebKit/Source/core:core_include_dirs",
]
include_dirs = [
# Blink code uses paths relative to these directories. We need them because
# we include Blink headers.
"//third_party/WebKit",
"//third_party/WebKit/public/platform",
"//third_party/WebKit/public/web",
"//third_party/WebKit/Source",
"$root_gen_dir/blink",
"$root_gen_dir/third_party/WebKit",
]
defines = [
# Blink-internal defines.
"BLINK_IMPLEMENTATION=1",
"INSIDE_BLINK",
]
deps = [
"//skia",
"//third_party/icu",
"//third_party/boringssl",
"//v8",
]
}
if (is_win) { if (is_win) {
# Target for building code that accesses chrome_elf internals. Included from # Target for building code that accesses chrome_elf internals. Included from
# the //chrome_elf:crash target. Defined as a static_library instead of a # the //chrome_elf:crash target. Defined as a static_library instead of a

25
patch/patches/component_build_1617.patch
View File

@@ -13,14 +13,23 @@ index 4393a8fac233..860715e86900 100644
explicit ContentServiceManagerMainDelegate(const ContentMainParams& params); explicit ContentServiceManagerMainDelegate(const ContentMainParams& params);
~ContentServiceManagerMainDelegate() override; ~ContentServiceManagerMainDelegate() override;
diff --git third_party/WebKit/Source/controller/BUILD.gn third_party/WebKit/Source/controller/BUILD.gn diff --git third_party/WebKit/Source/controller/BUILD.gn third_party/WebKit/Source/controller/BUILD.gn
index 714113da5d67..08130f97b76c 100644 index 714113da5d67..2a8feb621f4b 100644
--- third_party/WebKit/Source/controller/BUILD.gn --- third_party/WebKit/Source/controller/BUILD.gn
+++ third_party/WebKit/Source/controller/BUILD.gn +++ third_party/WebKit/Source/controller/BUILD.gn
@@ -16,6 +16,7 @@ component("controller") { @@ -25,6 +25,7 @@ component("controller") {
output_name = "blink_controller"
deps = [ configs += [
+ "//cef:webkit_set", "//build/config/compiler:wexit_time_destructors",
"//skia", + "//cef/libcef/features:config",
"//third_party/WebKit/Source/core", "//third_party/WebKit/Source:config",
"//third_party/WebKit/Source/modules", "//third_party/WebKit/Source:inside_blink",
"//third_party/WebKit/Source:non_test_config",
@@ -39,6 +40,8 @@ component("controller") {
"ControllerExport.h",
"OomInterventionImpl.cpp",
"OomInterventionImpl.h",
+ "//cef/libcef/renderer/webkit_glue.cc",
+ "//cef/libcef/renderer/webkit_glue.h",
]
if (is_mac) {