Commit d072de9f authored by Peter Kasting's avatar Peter Kasting Committed by Commit Bot

Revert "bindings: Add an intermediate target for generated module bindings."

This reverts commit a031ee0c.

Reason for revert: Possible cause of Chromium Win x64 PGO Builder compile failures; hypothesis is that filenames are exceeding the maximum path length.  See https://build.chromium.org/p/chromium.fyi/builders/Chromium%20Win%20x64%20PGO%20Builder/builds/19881 .

Original change's description:
> bindings: Add an intermediate target for generated module bindings.
> 
> Follow what's already done in bindings/core/v8 and add a
> "bindings_modules_impl" target to bindings/modules/v8 to aggregate all the
> .cpp/.h files generated by the other targets in the same BUILD.gn (the ones
> processing the modules IDL files).
> 
> By declaring the target in the same GN file, we can use get_target_outputs()
> to obtain some output names, which then allows us to get rid of
> |bindings_modules_generated_interface_files| as well as
> |bindings_modules_generated_partial_interface_files|.
> 
> This cleanup is also being done in preparation for getting rid of the
> hardcoded list of generated dictionary impl files we currently maintain in
> GN, as Source/modules:modules would not be able to retrieve any similar list
> of generated files that it needs.
> 
> Bug: 725996
> Change-Id: Ia53de40ef394af197351f218050af6d8a10f2c3a
> Reviewed-on: https://chromium-review.googlesource.com/517955
> Reviewed-by: Kentaro Hara <haraken@chromium.org>
> Reviewed-by: Hitoshi Yoshida <peria@chromium.org>
> Reviewed-by: Kenichi Ishibashi <bashi@chromium.org>
> Reviewed-by: Yuki Shiino <yukishiino@chromium.org>
> Commit-Queue: Raphael Kubo da Costa (rakuco) <raphael.kubo.da.costa@intel.com>
> Cr-Commit-Position: refs/heads/master@{#476243}

TBR=peria@chromium.org,yukishiino@chromium.org,raphael.kubo.da.costa@intel.com,bashi@chromium.org,haraken@chromium.org
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 725996

Change-Id: I416da9cb0234ec7a184edae527645805453a9177
Reviewed-on: https://chromium-review.googlesource.com/522226Reviewed-by: default avatarPeter Kasting <pkasting@chromium.org>
Reviewed-by: default avatarKentaro Hara <haraken@chromium.org>
Commit-Queue: Peter Kasting <pkasting@chromium.org>
Cr-Commit-Position: refs/heads/master@{#476532}
parent 70f73ad8
...@@ -15,7 +15,6 @@ group("bindings_modules_generated") { ...@@ -15,7 +15,6 @@ group("bindings_modules_generated") {
":bindings_modules_v8_generated_init_partial", ":bindings_modules_v8_generated_init_partial",
":generate_bindings_modules_v8_interfaces", ":generate_bindings_modules_v8_interfaces",
":generate_bindings_modules_v8_partial_interfaces", ":generate_bindings_modules_v8_partial_interfaces",
":generate_bindings_modules_v8_partial_interfaces_for_testing",
] ]
} }
...@@ -36,14 +35,8 @@ idl_impl("bindings_modules_impl_generated") { ...@@ -36,14 +35,8 @@ idl_impl("bindings_modules_impl_generated") {
} }
idl_compiler("generate_bindings_modules_v8_partial_interfaces") { idl_compiler("generate_bindings_modules_v8_partial_interfaces") {
sources = core_idl_with_modules_dependency_files sources = core_idl_with_modules_dependency_files +
output_dir = bindings_modules_v8_output_dir webcore_testing_idl_with_modules_dependency_files
output_name_suffix = "Partial"
target_component = "modules"
}
idl_compiler("generate_bindings_modules_v8_partial_interfaces_for_testing") {
sources = webcore_testing_idl_with_modules_dependency_files
output_dir = bindings_modules_v8_output_dir output_dir = bindings_modules_v8_output_dir
output_name_suffix = "Partial" output_name_suffix = "Partial"
target_component = "modules" target_component = "modules"
...@@ -75,17 +68,3 @@ action("bindings_modules_v8_generated_init_partial") { ...@@ -75,17 +68,3 @@ action("bindings_modules_v8_generated_init_partial") {
"//third_party/WebKit/Source/bindings/modules:interfaces_info", "//third_party/WebKit/Source/bindings/modules:interfaces_info",
] ]
} }
blink_modules_sources("bindings_modules_impl") {
# ":generate_bindings_modules_v8_partial_interfaces_for_testing" is not
# included here.
sources =
get_target_outputs(":generate_bindings_modules_v8_interfaces") +
get_target_outputs(":bindings_modules_impl_generated") +
get_target_outputs(":generate_bindings_modules_v8_partial_interfaces") +
get_target_outputs(":bindings_modules_v8_generated_init_partial")
deps = [
":bindings_modules_generated",
]
}
...@@ -82,3 +82,19 @@ generated_modules_callback_function_files = [ ...@@ -82,3 +82,19 @@ generated_modules_callback_function_files = [
"$bindings_modules_v8_output_dir/RemotePlaybackAvailabilityCallback.cpp", "$bindings_modules_v8_output_dir/RemotePlaybackAvailabilityCallback.cpp",
"$bindings_modules_v8_output_dir/RemotePlaybackAvailabilityCallback.h", "$bindings_modules_v8_output_dir/RemotePlaybackAvailabilityCallback.h",
] ]
bindings_modules_generated_interface_files =
process_file_template(
modules_definition_idl_files,
[
"$bindings_modules_v8_output_dir/V8{{source_name_part}}.cpp",
"$bindings_modules_v8_output_dir/V8{{source_name_part}}.h",
])
bindings_modules_generated_partial_interface_files =
process_file_template(
core_idl_with_modules_dependency_files,
[
"$bindings_modules_v8_output_dir/V8{{source_name_part}}Partial.cpp",
"$bindings_modules_v8_output_dir/V8{{source_name_part}}Partial.h",
])
...@@ -62,10 +62,21 @@ target(modules_target_type, "modules") { ...@@ -62,10 +62,21 @@ target(modules_target_type, "modules") {
"ModulesInitializer.h", "ModulesInitializer.h",
] ]
sources += generated_modules_dictionary_files
sources += generated_modules_callback_function_files
# Compile sources generated by module_names script. # Compile sources generated by module_names script.
sources += get_target_outputs(":module_names") sources += get_target_outputs(":module_names")
sources += bindings_modules_v8_files sources += bindings_modules_v8_files
sources += rebase_path(bindings_modules_generated_interface_files, ".", "//")
sources += rebase_path(bindings_modules_generated_union_type_files, ".", "//")
sources +=
rebase_path(bindings_modules_generated_partial_interface_files, ".", "//")
sources +=
rebase_path([ bindings_modules_generated_init_partial_interfaces_file ],
".",
"//")
configs += [ configs += [
":modules_implementation", ":modules_implementation",
...@@ -83,7 +94,6 @@ target(modules_target_type, "modules") { ...@@ -83,7 +94,6 @@ target(modules_target_type, "modules") {
":module_names", ":module_names",
"//device/geolocation/public/interfaces:interfaces_blink", "//device/geolocation/public/interfaces:interfaces_blink",
"//third_party/WebKit/Source/bindings/modules:generated", "//third_party/WebKit/Source/bindings/modules:generated",
"//third_party/WebKit/Source/bindings/modules/v8:bindings_modules_impl",
"//third_party/WebKit/Source/core", "//third_party/WebKit/Source/core",
"//third_party/WebKit/Source/modules/accessibility", "//third_party/WebKit/Source/modules/accessibility",
"//third_party/WebKit/Source/modules/app_banner", "//third_party/WebKit/Source/modules/app_banner",
......
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