| Index: sky/engine/core/BUILD.gn
|
| diff --git a/sky/engine/core/BUILD.gn b/sky/engine/core/BUILD.gn
|
| index 32836653529343cc63613b488b045bbc1bbab935..4d30fde625929d2c8c1b86c9dc3c271bf2d5db50 100644
|
| --- a/sky/engine/core/BUILD.gn
|
| +++ b/sky/engine/core/BUILD.gn
|
| @@ -2,7 +2,6 @@
|
| # Use of this source code is governed by a BSD-style license that can be
|
| # found in the LICENSE file.
|
|
|
| -import("//sky/engine/bindings/scripts/scripts.gni")
|
| import("//sky/engine/build/scripts/scripts.gni")
|
| import("//sky/engine/core/core.gni")
|
|
|
| @@ -13,7 +12,6 @@ rel_sky_core_gen_dir = rebase_path(sky_core_output_dir, root_build_dir)
|
| source_set("libraries") {
|
| public_deps = [
|
| "//base",
|
| - "//gin",
|
| "//gpu/command_buffer/client:gles2_c_lib",
|
| "//mojo/application",
|
| "//mojo/common",
|
| @@ -36,7 +34,6 @@ source_set("libraries") {
|
| "//third_party/qcms",
|
| "//third_party/zlib",
|
| "//url",
|
| - "//v8",
|
| ]
|
| }
|
|
|
| @@ -44,7 +41,6 @@ source_set("prerequisites") {
|
| deps = [
|
| ":libraries",
|
| ":make_core_generated",
|
| - "//sky/engine/bindings/core/v8:bindings_core_v8_generated",
|
| "//sky/engine/platform",
|
| ]
|
|
|
| @@ -65,6 +61,8 @@ static_library("core") {
|
| ":libraries",
|
| ":prerequisites",
|
| "//sky/engine/platform",
|
| + "//sky/engine/bindings2",
|
| + "//dart/runtime/bin:libdart_withcore",
|
| ]
|
|
|
| sources = sky_core_files
|
| @@ -72,7 +70,10 @@ static_library("core") {
|
| forward_dependent_configs_from = [ ":libraries" ]
|
|
|
| # core and core_generated are really the same thing.
|
| - allow_circular_includes_from = [ ":core_generated" ]
|
| + allow_circular_includes_from = [
|
| + ":core_generated",
|
| + "//sky/engine/bindings2",
|
| + ]
|
| }
|
|
|
| source_set("testing") {
|
| @@ -95,13 +96,7 @@ source_set("testing") {
|
| }
|
|
|
| source_set("core_generated") {
|
| - sources = bindings_core_v8_files
|
| -
|
| - # These files include all the .cpp files generated from the .idl files
|
| - # in webcore_files.
|
| - sources += bindings_core_generated_aggregate_files
|
| -
|
| - sources += [
|
| + sources = [
|
| # Generated from CSSTokenizer-in.cpp
|
| "$sky_core_output_dir/CSSTokenizer.cpp",
|
|
|
| @@ -117,22 +112,60 @@ source_set("core_generated") {
|
| deps = [
|
| ":make_core_generated",
|
| ":prerequisites",
|
| - "//gin",
|
| "//skia",
|
| - "//sky/engine/bindings/core/v8:bindings_core_v8_generated",
|
| "//sky/engine/platform",
|
| "//sky/engine/wtf",
|
| "//third_party/iccjpeg",
|
| "//third_party/libpng",
|
| "//third_party/qcms",
|
| "//url",
|
| - "//v8",
|
| ]
|
|
|
| include_dirs = [ "$root_build_dir" ]
|
| }
|
|
|
| -# core_bindings_generated ------------------------------------------------------
|
| +# core_event_interfaces --------------------------------------------------------
|
| +
|
| +# Calls generate_event_interfaces
|
| +#
|
| +# Parameters:
|
| +# sources = A list of IDL files to process.
|
| +# output_file = The .in file to write, relative to the sky_gen_dir.
|
| +# suffix = (Optional) String to be passed to script via --suffix
|
| +template("generate_event_interfaces") {
|
| + action(target_name) {
|
| + # Write the file list to a unique temp file to avoid blowing out the
|
| + # command line length limit.
|
| + idl_files_list = "$target_gen_dir/${target_name}_file_list.tmp"
|
| + write_file(idl_files_list, rebase_path(invoker.sources, root_build_dir))
|
| +
|
| + inputs = [
|
| + "//sky/engine/bindings2/scripts/utilities.py",
|
| + idl_files_list,
|
| + ] + invoker.sources
|
| +
|
| + output_file = "$root_gen_dir/sky/" + invoker.output_file
|
| + outputs = [
|
| + output_file,
|
| + ]
|
| +
|
| + script = "//sky/engine/bindings2/scripts/generate_event_interfaces.py"
|
| + args = [
|
| + "--event-idl-files-list",
|
| + rebase_path(idl_files_list, root_build_dir),
|
| + "--event-interfaces-file",
|
| + rebase_path(output_file, root_build_dir),
|
| + "--write-file-only-if-changed=1", # Always true for Ninja.
|
| + ]
|
| +
|
| + if (defined(invoker.suffix)) {
|
| + args += [
|
| + "--suffix",
|
| + invoker.suffix,
|
| + ]
|
| + }
|
| + }
|
| +}
|
|
|
| generate_event_interfaces("core_event_interfaces") {
|
| sources = core_event_idl_files
|
| @@ -300,12 +333,9 @@ process_in_files("make_core_generated_html_element_factory") {
|
| "$sky_core_output_dir/HTMLElementFactory.h",
|
| "$sky_core_output_dir/HTMLNames.cpp",
|
| "$sky_core_output_dir/HTMLNames.h",
|
| - "$sky_core_output_dir/V8HTMLElementWrapperFactory.cpp",
|
| - "$sky_core_output_dir/V8HTMLElementWrapperFactory.h",
|
| ]
|
| deps = [
|
| ":libraries",
|
| - "//sky/engine/bindings/core/v8:bindings_core_v8_generated",
|
| ]
|
| }
|
|
|
|
|