Commit 13c9a332 authored by Sylvain Defresne's avatar Sylvain Defresne Committed by Commit Bot

Convert //base to not depend on set_sources_assignment_filter()

set_sources_assignment_filter() is considered as a mis-feature
of gn (as it makes it difficult to reason about the BUILD.gn
files individually).

Convert BUILD.gn files below //base to instead use conditional
to include source files only on the platformn where they are
used.

The conversion was done by using a modified version of gn that
display all files filtered by set_sources_assignment_filter()
and updating the BUILD.gn files manually to explicitly add the
source files only on the platform that used them.

Bug: 1018739
Change-Id: I236542d7b8e2b5cba5b633b37791d1f1dbbe8d2a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1879458
Commit-Queue: Sylvain Defresne <sdefresne@chromium.org>
Reviewed-by: default avatarFrançois Doray <fdoray@chromium.org>
Cr-Commit-Position: refs/heads/master@{#710890}
parent ef266e86
This diff is collapsed.
...@@ -6,6 +6,12 @@ import("//build/compiled_action.gni") ...@@ -6,6 +6,12 @@ import("//build/compiled_action.gni")
import("//build/config/nacl/config.gni") import("//build/config/nacl/config.gni")
import("//build/config/ui.gni") import("//build/config/ui.gni")
# Reset sources_assignment_filter for the BUILD.gn file to prevent
# regression during the migration of Chromium away from the feature.
# See build/no_sources_assignment_filter.md for more information.
# TODO(crbug.com/1018739): remove this when migration is done.
set_sources_assignment_filter([])
if (is_android) { if (is_android) {
import("//build/config/android/rules.gni") import("//build/config/android/rules.gni")
} }
...@@ -41,10 +47,6 @@ static_library("test_support") { ...@@ -41,10 +47,6 @@ static_library("test_support") {
"../timer/mock_timer.cc", "../timer/mock_timer.cc",
"../timer/mock_timer.h", "../timer/mock_timer.h",
"../trace_event/trace_config_memory_test_util.h", "../trace_event/trace_config_memory_test_util.h",
"android/java_handler_thread_helpers.cc",
"android/java_handler_thread_helpers.h",
"android/url_utils.cc",
"android/url_utils.h",
"bind_test_util.cc", "bind_test_util.cc",
"bind_test_util.h", "bind_test_util.h",
"copy_only_int.cc", "copy_only_int.cc",
...@@ -60,8 +62,6 @@ static_library("test_support") { ...@@ -60,8 +62,6 @@ static_library("test_support") {
"gtest_xml_util.h", "gtest_xml_util.h",
"icu_test_util.cc", "icu_test_util.cc",
"icu_test_util.h", "icu_test_util.h",
"ios/wait_util.h",
"ios/wait_util.mm",
"launcher/test_result.cc", "launcher/test_result.cc",
"launcher/test_result.h", "launcher/test_result.h",
"launcher/test_results_tracker.h", "launcher/test_results_tracker.h",
...@@ -73,8 +73,6 @@ static_library("test_support") { ...@@ -73,8 +73,6 @@ static_library("test_support") {
"metrics/user_action_tester.cc", "metrics/user_action_tester.cc",
"metrics/user_action_tester.h", "metrics/user_action_tester.h",
"mock_callback.h", "mock_callback.h",
"mock_chrome_application_mac.h",
"mock_chrome_application_mac.mm",
"mock_devices_changed_observer.cc", "mock_devices_changed_observer.cc",
"mock_devices_changed_observer.h", "mock_devices_changed_observer.h",
"mock_entropy_provider.cc", "mock_entropy_provider.cc",
...@@ -83,7 +81,6 @@ static_library("test_support") { ...@@ -83,7 +81,6 @@ static_library("test_support") {
"mock_log.h", "mock_log.h",
"move_only_int.h", "move_only_int.h",
"multiprocess_test.h", "multiprocess_test.h",
"multiprocess_test_android.cc",
"null_task_runner.cc", "null_task_runner.cc",
"null_task_runner.h", "null_task_runner.h",
"perf_log.cc", "perf_log.cc",
...@@ -94,7 +91,6 @@ static_library("test_support") { ...@@ -94,7 +91,6 @@ static_library("test_support") {
"perf_time_logger.h", "perf_time_logger.h",
"power_monitor_test_base.cc", "power_monitor_test_base.cc",
"power_monitor_test_base.h", "power_monitor_test_base.h",
"reached_code_profiler_android.cc",
"scoped_command_line.cc", "scoped_command_line.cc",
"scoped_command_line.h", "scoped_command_line.h",
"scoped_environment_variable_override.cc", "scoped_environment_variable_override.cc",
...@@ -105,8 +101,6 @@ static_library("test_support") { ...@@ -105,8 +101,6 @@ static_library("test_support") {
"scoped_mock_clock_override.h", "scoped_mock_clock_override.h",
"scoped_mock_time_message_loop_task_runner.cc", "scoped_mock_time_message_loop_task_runner.cc",
"scoped_mock_time_message_loop_task_runner.h", "scoped_mock_time_message_loop_task_runner.h",
"scoped_os_info_override_win.cc",
"scoped_os_info_override_win.h",
"scoped_path_override.cc", "scoped_path_override.cc",
"scoped_path_override.h", "scoped_path_override.h",
"sequenced_task_runner_test_template.cc", "sequenced_task_runner_test_template.cc",
...@@ -123,35 +117,20 @@ static_library("test_support") { ...@@ -123,35 +117,20 @@ static_library("test_support") {
"test_discardable_memory_allocator.h", "test_discardable_memory_allocator.h",
"test_file_util.cc", "test_file_util.cc",
"test_file_util.h", "test_file_util.h",
"test_file_util_android.cc",
"test_file_util_linux.cc",
"test_file_util_mac.cc",
"test_file_util_win.cc",
"test_io_thread.cc", "test_io_thread.cc",
"test_io_thread.h", "test_io_thread.h",
"test_listener_ios.h",
"test_listener_ios.mm",
"test_message_loop.cc", "test_message_loop.cc",
"test_message_loop.h", "test_message_loop.h",
"test_mock_time_task_runner.cc", "test_mock_time_task_runner.cc",
"test_mock_time_task_runner.h", "test_mock_time_task_runner.h",
"test_pending_task.cc", "test_pending_task.cc",
"test_pending_task.h", "test_pending_task.h",
"test_reg_util_win.cc",
"test_reg_util_win.h",
"test_shared_memory_util.cc", "test_shared_memory_util.cc",
"test_shared_memory_util.h", "test_shared_memory_util.h",
"test_shortcut_win.cc",
"test_shortcut_win.h",
"test_simple_task_runner.cc", "test_simple_task_runner.cc",
"test_simple_task_runner.h", "test_simple_task_runner.h",
"test_suite.cc", "test_suite.cc",
"test_suite.h", "test_suite.h",
"test_support_android.cc",
"test_support_android.h",
"test_support_ios.h",
"test_support_ios.mm",
"thread_pool_test_helpers_android.cc",
"thread_test_helper.cc", "thread_test_helper.cc",
"thread_test_helper.h", "thread_test_helper.h",
"trace_event_analyzer.cc", "trace_event_analyzer.cc",
...@@ -162,8 +141,55 @@ static_library("test_support") { ...@@ -162,8 +141,55 @@ static_library("test_support") {
"values_test_util.h", "values_test_util.h",
] ]
if (is_win) {
sources += [
"scoped_os_info_override_win.cc",
"scoped_os_info_override_win.h",
"test_file_util_win.cc",
"test_reg_util_win.cc",
"test_reg_util_win.h",
"test_shortcut_win.cc",
"test_shortcut_win.h",
]
}
if (is_linux) {
sources += [ "test_file_util_linux.cc" ]
}
if (is_mac) {
sources += [
"mock_chrome_application_mac.h",
"mock_chrome_application_mac.mm",
"test_file_util_mac.cc",
]
}
if (is_android) {
sources += [
"android/java_handler_thread_helpers.cc",
"android/java_handler_thread_helpers.h",
"android/url_utils.cc",
"android/url_utils.h",
"multiprocess_test_android.cc",
"reached_code_profiler_android.cc",
"test_file_util_android.cc",
"test_support_android.cc",
"test_support_android.h",
"thread_pool_test_helpers_android.cc",
]
}
if (is_ios) { if (is_ios) {
sources += [ "launcher/unit_test_launcher_ios.cc" ] sources += [
"ios/wait_util.h",
"ios/wait_util.mm",
"launcher/unit_test_launcher_ios.cc",
"test_listener_ios.h",
"test_listener_ios.mm",
"test_support_ios.h",
"test_support_ios.mm",
]
} else if (!is_nacl_nonsfi) { } else if (!is_nacl_nonsfi) {
sources += [ sources += [
"launcher/test_launcher.cc", "launcher/test_launcher.cc",
...@@ -223,9 +249,7 @@ static_library("test_support") { ...@@ -223,9 +249,7 @@ static_library("test_support") {
} }
if (is_ios) { if (is_ios) {
set_sources_assignment_filter([])
sources += [ "test_file_util_mac.cc" ] sources += [ "test_file_util_mac.cc" ]
set_sources_assignment_filter(sources_assignment_filter)
deps += [ ":google_test_runner_shared_headers" ] deps += [ ":google_test_runner_shared_headers" ]
} }
...@@ -234,9 +258,7 @@ static_library("test_support") { ...@@ -234,9 +258,7 @@ static_library("test_support") {
} }
if (is_android) { if (is_android) {
set_sources_assignment_filter([])
sources += [ "test_file_util_linux.cc" ] sources += [ "test_file_util_linux.cc" ]
set_sources_assignment_filter(sources_assignment_filter)
deps += [ deps += [
":base_unittests_jni_headers", ":base_unittests_jni_headers",
":test_support_jni_headers", ":test_support_jni_headers",
......
...@@ -2,6 +2,12 @@ ...@@ -2,6 +2,12 @@
# Use of this source code is governed by a BSD-style license that can be # Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file. # found in the LICENSE file.
# Reset sources_assignment_filter for the BUILD.gn file to prevent
# regression during the migration of Chromium away from the feature.
# See build/no_sources_assignment_filter.md for more information.
# TODO(crbug.com/1018739): remove this when migration is done.
set_sources_assignment_filter([])
source_set("memory_pressure") { source_set("memory_pressure") {
sources = [ sources = [
"memory_pressure_voter.cc", "memory_pressure_voter.cc",
...@@ -10,13 +16,28 @@ source_set("memory_pressure") { ...@@ -10,13 +16,28 @@ source_set("memory_pressure") {
"multi_source_memory_pressure_monitor.h", "multi_source_memory_pressure_monitor.h",
"system_memory_pressure_evaluator.cc", "system_memory_pressure_evaluator.cc",
"system_memory_pressure_evaluator.h", "system_memory_pressure_evaluator.h",
"system_memory_pressure_evaluator_chromeos.cc", ]
"system_memory_pressure_evaluator_chromeos.h",
"system_memory_pressure_evaluator_mac.cc", if (is_win) {
"system_memory_pressure_evaluator_mac.h", sources += [
"system_memory_pressure_evaluator_win.cc", "system_memory_pressure_evaluator_win.cc",
"system_memory_pressure_evaluator_win.h", "system_memory_pressure_evaluator_win.h",
] ]
}
if (is_mac) {
sources += [
"system_memory_pressure_evaluator_mac.cc",
"system_memory_pressure_evaluator_mac.h",
]
}
if (is_chromeos) {
sources += [
"system_memory_pressure_evaluator_chromeos.cc",
"system_memory_pressure_evaluator_chromeos.h",
]
}
deps = [ deps = [
"//base", "//base",
...@@ -28,11 +49,20 @@ source_set("unittests") { ...@@ -28,11 +49,20 @@ source_set("unittests") {
sources = [ sources = [
"memory_pressure_voter_unittest.cc", "memory_pressure_voter_unittest.cc",
"multi_source_memory_pressure_monitor_unittest.cc", "multi_source_memory_pressure_monitor_unittest.cc",
"system_memory_pressure_evaluator_chromeos_unittest.cc",
"system_memory_pressure_evaluator_mac_unittest.cc",
"system_memory_pressure_evaluator_win_unittest.cc",
] ]
if (is_win) {
sources += [ "system_memory_pressure_evaluator_win_unittest.cc" ]
}
if (is_mac) {
sources += [ "system_memory_pressure_evaluator_mac_unittest.cc" ]
}
if (is_chromeos) {
sources += [ "system_memory_pressure_evaluator_chromeos_unittest.cc" ]
}
deps = [ deps = [
":memory_pressure", ":memory_pressure",
"//base", "//base",
......
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