| Index: third_party/WebKit/Source/core/BUILD.gn
|
| diff --git a/third_party/WebKit/Source/core/BUILD.gn b/third_party/WebKit/Source/core/BUILD.gn
|
| index 964cbf3edc633ba1ea08b3b8fd98c40547884a8a..22eca26536bb117a79c111c6cd2abf75d76a0d65 100644
|
| --- a/third_party/WebKit/Source/core/BUILD.gn
|
| +++ b/third_party/WebKit/Source/core/BUILD.gn
|
| @@ -5,7 +5,6 @@
|
| import("//build/config/chrome_build.gni")
|
| import("//build/config/chromecast_build.gni")
|
| import("//build/config/ui.gni")
|
| -import("//build/split_static_library.gni")
|
| import("//third_party/WebKit/Source/bindings/bindings.gni")
|
| import("//third_party/WebKit/Source/bindings/core/v8/generated.gni")
|
| import("//third_party/WebKit/Source/bindings/modules/modules.gni")
|
| @@ -68,16 +67,6 @@
|
| if (is_android && use_openmax_dl_fft) {
|
| include_dirs += [ "//third_party/openmax_dl" ]
|
| }
|
| -}
|
| -
|
| -if (is_component_build) {
|
| - link_target_type = "source_set"
|
| -} else {
|
| - link_target_type = "split_static_library"
|
| -
|
| - # Safe split count for all of these split libraries - largest is ~6 GB in 32-bit
|
| - # official builds.
|
| - split_count = 6
|
| }
|
|
|
| # GYP version: WebKit/Source/core/core.gyp:webcore_generated
|
| @@ -199,7 +188,7 @@
|
| }
|
|
|
| # GYP version: //third_party/WebKit/Source/core/core.gyp:webcore_dom
|
| -target(link_target_type, "dom") {
|
| +source_set("dom") {
|
| sources = rebase_path(webcore_dom_files, ".", "//")
|
|
|
| configs -= core_config_remove
|
| @@ -214,7 +203,7 @@
|
| }
|
|
|
| # GYP version: //third_party/WebKit/Source/core/core.gyp:webcore_html
|
| -target(link_target_type, "html") {
|
| +source_set("html") {
|
| sources = rebase_path(webcore_html_files, ".", "//")
|
|
|
| configs -= core_config_remove
|
| @@ -226,7 +215,7 @@
|
| }
|
|
|
| # GYP version: //third_party/WebKit/Source/core/core.gyp:webcore_svg
|
| -target(link_target_type, "svg") {
|
| +source_set("svg") {
|
| sources = rebase_path(webcore_svg_files, ".", "//")
|
|
|
| configs -= core_config_remove
|
| @@ -238,7 +227,7 @@
|
| }
|
|
|
| # GYP version: //third_party/WebKit/Source/core/core.gyp:webcore_remaining
|
| -target(link_target_type, "remaining") {
|
| +source_set("remaining") {
|
| # This is currently a mashup of "webcore_rendering" and "webcore_remaining"
|
| # in GYP. The file list variable is the same and then GYP filters on wether
|
| # the path starts with "rendering/" or not. We should tweak the .gypis a bit
|
| @@ -347,7 +336,7 @@
|
| }
|
|
|
| # GYP version: //third_party/WebKit/Source/core/core.gyp:webcore_generated
|
| -target(link_target_type, "core_generated") {
|
| +source_set("core_generated") {
|
| sources = bindings_core_v8_files
|
|
|
| # These files include all the .cpp files generated from the .idl files
|
|
|