Skip to content

GitLab

T
tangled
Commit 40c978e6 authored by Sylvain Defresne's avatar Sylvain Defresne Committed by Commit Bot
Browse files
Options

Clean up deprecated sources assignment filter in //chromecast 

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

Bug: 1018739
Change-Id: Ic2936815867eb60aae58f59e1b6ff229ebd8e112
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2443134
Commit-Queue: Sylvain Defresne <sdefresne@chromium.org>
Reviewed-by: default avatarYuchen Liu <yucliu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#813147}
parent 3fedff45
Hide whitespace changes
Inline Side-by-side
Showing with 60 additions and 61 deletions
chromecast/app/BUILD.gn
View file @ 40c978e6
......@@ -6,13 +6,6 @@ import("//chromecast/chromecast.gni")
import("//testing/test.gni")
import("//tools/grit/grit_rule.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)
cast_source_set("app") {
sources = [
"cast_main_delegate.cc",
......@@ -44,14 +37,7 @@ cast_source_set("app") {
}
cast_source_set("cast_crash_client") {
sources = [
"android/cast_crash_reporter_client_android.cc",
"android/cast_crash_reporter_client_android.h",
"android/crash_handler.cc",
"android/crash_handler.h",
"linux/cast_crash_reporter_client.cc",
"linux/cast_crash_reporter_client.h",
]
sources = []
deps = [
"//base",
......@@ -67,7 +53,20 @@ cast_source_set("cast_crash_client") {
]
}
if (is_linux || is_chromeos) {
sources += [
"linux/cast_crash_reporter_client.cc",
"linux/cast_crash_reporter_client.h",
]
}
if (is_android) {
sources += [
"android/cast_crash_reporter_client_android.cc",
"android/cast_crash_reporter_client_android.h",
"android/crash_handler.cc",
"android/crash_handler.h",
]
deps += [
"//chromecast/base:android_create_sys_info",
"//chromecast/base:cast_version",
......@@ -93,7 +92,11 @@ cast_source_set("test_support") {
cast_source_set("unittests") {
testonly = true
sources = [ "linux/cast_crash_reporter_client_unittest.cc" ]
sources = []
if (is_linux || is_chromeos) {
sources += [ "linux/cast_crash_reporter_client_unittest.cc" ]
}
deps = [
"//base",
......
chromecast/base/BUILD.gn
View file @ 40c978e6
......@@ -10,13 +10,6 @@ if (is_android) {
import("//build/config/android/rules.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)
declare_args() {
# Denotes the type of Cast product. This is #defined as CAST_PRODUCT_TYPE in
# version.h. See //third_party/metrics_proto/cast_logs.proto for valid values.
......@@ -49,12 +42,6 @@ cast_source_set("base") {
sources = [
"alarm_manager.cc",
"alarm_manager.h",
"android/cast_settings_manager.cc",
"android/cast_settings_manager.h",
"android/dumpstate_writer.cc",
"android/dumpstate_writer.h",
"android/system_time_change_notifier_android.cc",
"android/system_time_change_notifier_android.h",
"bind_to_task_runner.h",
"bitstream_audio_codecs.cc",
"bitstream_audio_codecs.h",
......@@ -104,10 +91,6 @@ cast_source_set("base") {
"//chromecast:chromecast_buildflags",
]
if (is_android) {
deps += [ ":jni_headers" ]
}
if (chromecast_branding == "public") {
sources += [ "cast_features_internal.cc" ]
} else {
......@@ -115,7 +98,16 @@ cast_source_set("base") {
}
if (is_android) {
sources += [ "chromecast_config_android.h" ]
sources += [
"android/cast_settings_manager.cc",
"android/cast_settings_manager.h",
"android/dumpstate_writer.cc",
"android/dumpstate_writer.h",
"android/system_time_change_notifier_android.cc",
"android/system_time_change_notifier_android.h",
"chromecast_config_android.h",
]
deps += [ ":jni_headers" ]
if (chromecast_branding == "public") {
sources += [ "chromecast_config_android_dummy.cc" ]
} else {
......
chromecast/crash/BUILD.gn
View file @ 40c978e6
......@@ -5,13 +5,6 @@
import("//chromecast/chromecast.gni")
import("//testing/test.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)
cast_source_set("build_info") {
sources = [
"build_info.cc",
......@@ -70,23 +63,28 @@ cast_source_set("crash") {
sources += [
"cast_crashdump_uploader.cc",
"cast_crashdump_uploader.h",
"linux/crash_util.cc",
"linux/crash_util.h",
"linux/dummy_minidump_generator.cc",
"linux/dummy_minidump_generator.h",
"linux/dump_info.cc",
"linux/dump_info.h",
"linux/minidump_generator.h",
"linux/minidump_params.cc",
"linux/minidump_params.h",
"linux/minidump_uploader.cc",
"linux/minidump_uploader.h",
"linux/minidump_writer.cc",
"linux/minidump_writer.h",
"linux/synchronized_minidump_manager.cc",
"linux/synchronized_minidump_manager.h",
]
if (is_linux || is_chromeos) {
sources += [
"linux/crash_util.cc",
"linux/crash_util.h",
"linux/dummy_minidump_generator.cc",
"linux/dummy_minidump_generator.h",
"linux/dump_info.cc",
"linux/dump_info.h",
"linux/minidump_generator.h",
"linux/minidump_params.cc",
"linux/minidump_params.h",
"linux/minidump_uploader.cc",
"linux/minidump_uploader.h",
"linux/minidump_writer.cc",
"linux/minidump_writer.h",
"linux/synchronized_minidump_manager.cc",
"linux/synchronized_minidump_manager.h",
]
}
deps += [
":build_info",
"//chromecast/base",
......@@ -102,7 +100,10 @@ cast_source_set("crash") {
if (!is_fuchsia) {
cast_executable("crash_uploader") {
sources = [ "linux/crash_uploader.cc" ]
sources = []
if (is_linux || is_chromeos) {
sources += [ "linux/crash_uploader.cc" ]
}
deps = [
":crash",
......@@ -116,10 +117,13 @@ if (!is_fuchsia) {
}
cast_source_set("test_support") {
sources = [
"linux/crash_testing_utils.cc",
"linux/crash_testing_utils.h",
]
sources = []
if (is_linux || is_chromeos) {
sources += [
"linux/crash_testing_utils.cc",
"linux/crash_testing_utils.h",
]
}
deps = [
":crash",
......
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