Commit c6fe9c3d authored by Sylvain Defresne's avatar Sylvain Defresne Committed by Commit Bot

Clean up deprecated sources assignment filter in //chrome/test

Remove deprecated_default_sources_assignment_filter and replace
it with explicit is_win, is_mac, etc. sections.

Bug: 1018739
Change-Id: I21bfac28a135911ecad7c0153de245ca6a326dd2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2445498Reviewed-by: default avatarVasilii Sukhanov <vasilii@chromium.org>
Commit-Queue: Sylvain Defresne <sdefresne@chromium.org>
Cr-Commit-Position: refs/heads/master@{#814342}
parent 05f9c6b0
This diff is collapsed.
...@@ -8,13 +8,6 @@ import("//build/util/lastchange.gni") ...@@ -8,13 +8,6 @@ import("//build/util/lastchange.gni")
import("//testing/test.gni") import("//testing/test.gni")
import("//third_party/ffmpeg/ffmpeg_options.gni") import("//third_party/ffmpeg/ffmpeg_options.gni")
# This file depends on the legacy global sources assignment filter. It should
# be converted to check target platform before assigning source files to the
# sources variable. Remove this import and set_sources_assignment_filter call
# when the file has been converted. See https://crbug.com/1018739 for details.
import("//build/config/deprecated_default_sources_assignment_filter.gni")
set_sources_assignment_filter(deprecated_default_sources_assignment_filter)
action("embed_js_in_cpp") { action("embed_js_in_cpp") {
script = "embed_js_in_cpp.py" script = "embed_js_in_cpp.py"
...@@ -77,7 +70,6 @@ source_set("automation_client_lib") { ...@@ -77,7 +70,6 @@ source_set("automation_client_lib") {
"chrome/chrome_desktop_impl.h", "chrome/chrome_desktop_impl.h",
"chrome/chrome_finder.cc", "chrome/chrome_finder.cc",
"chrome/chrome_finder.h", "chrome/chrome_finder.h",
"chrome/chrome_finder_mac.mm",
"chrome/chrome_impl.cc", "chrome/chrome_impl.cc",
"chrome/chrome_impl.h", "chrome/chrome_impl.h",
"chrome/chrome_remote_impl.cc", "chrome/chrome_remote_impl.cc",
...@@ -169,6 +161,10 @@ source_set("automation_client_lib") { ...@@ -169,6 +161,10 @@ source_set("automation_client_lib") {
"net/websocket.h", "net/websocket.h",
] ]
if (is_mac) {
sources += [ "chrome/chrome_finder_mac.mm" ]
}
# Also compile the generated files. # Also compile the generated files.
sources += get_target_outputs(":embed_js_in_cpp") sources += get_target_outputs(":embed_js_in_cpp")
sources += get_target_outputs(":embed_user_data_dir_in_cpp") sources += get_target_outputs(":embed_user_data_dir_in_cpp")
...@@ -226,8 +222,6 @@ source_set("lib") { ...@@ -226,8 +222,6 @@ source_set("lib") {
"key_converter.cc", "key_converter.cc",
"key_converter.h", "key_converter.h",
"keycode_text_conversion.h", "keycode_text_conversion.h",
"keycode_text_conversion_mac.mm",
"keycode_text_conversion_win.cc",
"logging.cc", "logging.cc",
"logging.h", "logging.h",
"performance_logger.cc", "performance_logger.cc",
...@@ -250,6 +244,14 @@ source_set("lib") { ...@@ -250,6 +244,14 @@ source_set("lib") {
"window_commands.h", "window_commands.h",
] ]
if (is_mac) {
sources += [ "keycode_text_conversion_mac.mm" ]
}
if (is_win) {
sources += [ "keycode_text_conversion_win.cc" ]
}
if (use_x11) { if (use_x11) {
sources += [ "keycode_text_conversion_x.cc" ] sources += [ "keycode_text_conversion_x.cc" ]
} }
......
...@@ -5,18 +5,14 @@ ...@@ -5,18 +5,14 @@
import("//third_party/closure_compiler/compile_js.gni") import("//third_party/closure_compiler/compile_js.gni")
import("//ui/webui/resources/tools/js_modulizer.gni") import("//ui/webui/resources/tools/js_modulizer.gni")
# This file depends on the legacy global sources assignment filter. It should
# be converted to check target platform before assigning source files to the
# sources variable. Remove this import and set_sources_assignment_filter call
# when the file has been converted. See https://crbug.com/1018739 for details.
import("//build/config/deprecated_default_sources_assignment_filter.gni")
set_sources_assignment_filter(deprecated_default_sources_assignment_filter)
js_modulizer("modulize") { js_modulizer("modulize") {
input_files = [ "fake_network_config_mojom.js" ] input_files = [ "fake_network_config_mojom.js" ]
} }
js_library("fake_network_config_mojom.m") { js_library("fake_network_config_mojom.m") {
sources = [ "$root_gen_dir/chrome/test/data/webui/chromeos/fake_network_config_mojom.m.js" ] sources = []
if (is_chromeos) {
sources += [ "$root_gen_dir/chrome/test/data/webui/chromeos/fake_network_config_mojom.m.js" ]
}
extra_deps = [ ":modulize" ] extra_deps = [ ":modulize" ]
} }
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