summaryrefslogtreecommitdiff
path: root/chromium/chromecast
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/chromecast')
-rw-r--r--chromium/chromecast/BUILD.gn2
-rw-r--r--chromium/chromecast/base/BUILD.gn4
-rw-r--r--chromium/chromecast/browser/BUILD.gn28
-rw-r--r--chromium/chromecast/browser/android/BUILD.gn5
-rw-r--r--chromium/chromecast/browser/metrics/BUILD.gn2
-rw-r--r--chromium/chromecast/chromecast.gni11
-rw-r--r--chromium/chromecast/crash/BUILD.gn1
-rw-r--r--chromium/chromecast/external_mojo/external_service_support/BUILD.gn64
-rw-r--r--chromium/chromecast/media/audio/BUILD.gn27
-rw-r--r--chromium/chromecast/media/cdm/BUILD.gn12
-rw-r--r--chromium/chromecast/media/cma/backend/desktop/BUILD.gn13
-rw-r--r--chromium/chromecast/renderer/BUILD.gn2
-rw-r--r--chromium/chromecast/system/reboot/BUILD.gn31
-rw-r--r--chromium/chromecast/ui/BUILD.gn4
14 files changed, 190 insertions, 16 deletions
diff --git a/chromium/chromecast/BUILD.gn b/chromium/chromecast/BUILD.gn
index f3a49cb4688..eaeb27e809e 100644
--- a/chromium/chromecast/BUILD.gn
+++ b/chromium/chromecast/BUILD.gn
@@ -650,7 +650,7 @@ if (is_android) {
android_manifest_dep = "//chromecast/browser/android:cast_shell_manifest"
min_sdk_version = 21
- target_sdk_version = 29
+ target_sdk_version = 30
shared_libraries = [ "//chromecast/android:libcast_shell_android" ]
diff --git a/chromium/chromecast/base/BUILD.gn b/chromium/chromecast/base/BUILD.gn
index 3143b34bfb3..5f3f619696d 100644
--- a/chromium/chromecast/base/BUILD.gn
+++ b/chromium/chromecast/base/BUILD.gn
@@ -244,7 +244,10 @@ if (is_android) {
deps = [
":cast_sys_info_util",
+ ":chromecast_switches",
":dummy_cast_sys_info",
+ ":init_shlib",
+ "//base",
"//chromecast/public",
]
}
@@ -391,6 +394,7 @@ if (is_android) {
deps = [
":base_java",
":cast_base_test_utils_java",
+ "//base:base_java",
"//base:base_junit_test_support",
"//third_party/hamcrest:hamcrest_java",
]
diff --git a/chromium/chromecast/browser/BUILD.gn b/chromium/chromecast/browser/BUILD.gn
index da6347ebb27..60d96dae593 100644
--- a/chromium/chromecast/browser/BUILD.gn
+++ b/chromium/chromecast/browser/BUILD.gn
@@ -177,6 +177,7 @@ cast_source_set("browser") {
"//chromecast/media:libcast_media",
"//chromecast/media/base:media_codec_support",
"//chromecast/media/base:video_plane_controller",
+ "//chromecast/media/cdm:cdm_origin_provider",
"//chromecast/media/service",
"//chromecast/media/service/mojom",
"//chromecast/net",
@@ -186,7 +187,7 @@ cast_source_set("browser") {
"//components/download/public/common:public",
"//components/media_control/browser",
"//components/metrics",
- "//components/metrics:gpu",
+ "//components/metrics:content",
"//components/metrics:net",
"//components/variations/net",
@@ -208,6 +209,7 @@ cast_source_set("browser") {
"//gpu",
"//ipc",
"//media",
+ "//media/mojo/mojom:remoting",
"//media/mojo/services",
"//net",
"//services/media_session/public/mojom",
@@ -589,6 +591,14 @@ cast_source_set("unittests") {
"//ui/events:test_support",
]
}
+
+ if (is_linux && use_ozone) {
+ sources += [ "webview/webview_window_manager_unittest.cc" ]
+ deps += [
+ "//chromecast/graphics",
+ "//components/exo",
+ ]
+ }
}
if (is_android) {
@@ -610,6 +620,22 @@ if (is_android) {
}
}
+# Could be used in the internal build if the internal implementation won't be
+# included, for example, some unit tests.
+cast_source_set("simple_browser") {
+ sources = [
+ "cast_browser_main_parts_simple.cc",
+ "cast_content_browser_client_simple.cc",
+ "pref_service_helper_simple.cc",
+ ]
+
+ deps = [
+ ":browser",
+ ":prefs",
+ "//chromecast/base:default_create_sys_info",
+ ]
+}
+
cast_source_set("web_contents_provider") {
sources = [ "webview/web_contents_provider.h" ]
diff --git a/chromium/chromecast/browser/android/BUILD.gn b/chromium/chromecast/browser/android/BUILD.gn
index 67d171d0447..94e4d35d53f 100644
--- a/chromium/chromecast/browser/android/BUILD.gn
+++ b/chromium/chromecast/browser/android/BUILD.gn
@@ -237,13 +237,18 @@ junit_binary("cast_shell_junit_tests") {
srcjar_deps = [ ":cast_shell_build_config_gen" ]
deps = [
+ ":cast_audio_manager_java",
":cast_intents_java",
":cast_shell_java",
+ ":reactive_android_java",
+ "//base:base_java",
"//base:base_java_test_support",
"//base:base_junit_test_support",
+ "//chromecast/base:base_java",
"//chromecast/base:cast_base_test_utils_java",
"//content/public/android:content_java",
"//third_party/android_deps:androidx_legacy_legacy_support_core_utils_java",
+ "//third_party/android_deps:androidx_localbroadcastmanager_localbroadcastmanager_java",
"//third_party/hamcrest:hamcrest_java",
]
}
diff --git a/chromium/chromecast/browser/metrics/BUILD.gn b/chromium/chromecast/browser/metrics/BUILD.gn
index c02974504ff..1ac7d15b428 100644
--- a/chromium/chromecast/browser/metrics/BUILD.gn
+++ b/chromium/chromecast/browser/metrics/BUILD.gn
@@ -22,7 +22,7 @@ cast_source_set("metrics") {
"//chromecast/base:cast_version",
"//chromecast/metrics",
"//components/metrics",
- "//components/metrics:gpu",
+ "//components/metrics:content",
"//components/metrics:net",
"//components/metrics:ui",
"//components/prefs",
diff --git a/chromium/chromecast/chromecast.gni b/chromium/chromecast/chromecast.gni
index 6feaaaefe4d..6b59e2b7064 100644
--- a/chromium/chromecast/chromecast.gni
+++ b/chromium/chromecast/chromecast.gni
@@ -116,6 +116,10 @@ declare_args() {
# within cast_shell.
enable_external_mojo_services = is_linux
+ # Support Perfetto tracing of processes that depend on entry points in
+ # //chromecast/external_mojo/external_service_support
+ enable_external_mojo_tracing = false
+
# Recording happens at this sample rate. Must be 16000, 48000 or 96000 Hz.
audio_input_sample_rate = 16000
@@ -127,6 +131,13 @@ declare_args() {
# Extra rpath to use for standalone services.
iot_service_rpath = ""
+
+ # Set to true to enable media overlay for volume bar, etc.
+ enable_media_overlay = false
+
+ # Set to true to forward crashes to the system's crash handler instead of
+ # handling them internally. This disables the built-in crash handler.
+ use_system_crash_handler = false
}
declare_args() {
diff --git a/chromium/chromecast/crash/BUILD.gn b/chromium/chromecast/crash/BUILD.gn
index 6f1b958d73f..f6b4fdf1fb6 100644
--- a/chromium/chromecast/crash/BUILD.gn
+++ b/chromium/chromecast/crash/BUILD.gn
@@ -94,6 +94,7 @@ if (!is_fuchsia) {
"//chromecast/base:default_create_sys_info",
"//chromecast/public",
"//chromecast/system/reboot:reboot_util",
+ "//third_party/crashpad/crashpad/client",
]
}
diff --git a/chromium/chromecast/external_mojo/external_service_support/BUILD.gn b/chromium/chromecast/external_mojo/external_service_support/BUILD.gn
index 7c3f4cb0cda..9d6f3fc22b4 100644
--- a/chromium/chromecast/external_mojo/external_service_support/BUILD.gn
+++ b/chromium/chromecast/external_mojo/external_service_support/BUILD.gn
@@ -2,6 +2,8 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+import("//chromecast/chromecast.gni")
+
source_set("external_service") {
sources = [
"external_connector.h",
@@ -32,14 +34,57 @@ source_set("process_setup") {
]
if (!is_fuchsia) {
- sources += [
- "crash_reporter_client.cc",
- "crash_reporter_client.h",
- ]
- deps += [
- "//chromecast/crash",
- "//components/crash/core/app",
- ]
+ sources += [ "crash_reporter_client.h" ]
+
+ if (use_system_crash_handler) {
+ sources += [ "crash_reporter_system.cc" ]
+ deps += [ "//third_party/crashpad/crashpad/client" ]
+ } else {
+ sources += [ "crash_reporter_builtin.cc" ]
+ deps += [
+ "//chromecast/crash",
+ "//components/crash/core/app",
+ ]
+ }
+ }
+}
+
+source_set("tracing_client_hdr") {
+ sources = [ "tracing_client.h" ]
+}
+
+source_set("tracing_client_dummy") {
+ sources = [
+ "tracing_client_dummy.cc",
+ "tracing_client_dummy.h",
+ ]
+ deps = [ ":tracing_client_hdr" ]
+}
+
+source_set("tracing_client_impl") {
+ sources = [
+ "tracing_client_impl.cc",
+ "tracing_client_impl.h",
+ ]
+ deps = [
+ ":external_service",
+ ":tracing_client_hdr",
+ "//base",
+ "//chromecast:chromecast_buildflags",
+ "//mojo/public/cpp/bindings",
+ "//services/tracing:lib",
+ "//services/tracing/public/cpp",
+ "//services/tracing/public/cpp:traced_process",
+ "//services/tracing/public/mojom",
+ ]
+}
+
+group("tracing_client") {
+ public_deps = [ ":tracing_client_hdr" ]
+ if (enable_external_mojo_tracing) {
+ public_deps += [ ":tracing_client_impl" ]
+ } else {
+ public_deps += [ ":tracing_client_dummy" ]
}
}
@@ -52,6 +97,7 @@ source_set("standalone_service_main") {
deps = [
":external_service",
":process_setup",
+ ":tracing_client",
"//base",
"//chromecast/external_mojo/public/cpp:common",
"//mojo/core/embedder",
@@ -77,7 +123,9 @@ source_set("chromium_service") {
executable("standalone_mojo_broker") {
sources = [ "standalone_mojo_broker.cc" ]
deps = [
+ ":external_service",
":process_setup",
+ ":tracing_client",
"//base",
"//chromecast/external_mojo/public/cpp:common",
"//chromecast/external_mojo/public/cpp:external_mojo_broker",
diff --git a/chromium/chromecast/media/audio/BUILD.gn b/chromium/chromecast/media/audio/BUILD.gn
index 1e8b13a84d8..28f95044461 100644
--- a/chromium/chromecast/media/audio/BUILD.gn
+++ b/chromium/chromecast/media/audio/BUILD.gn
@@ -57,6 +57,24 @@ cast_source_set("interleaved_channel_mixer") {
]
}
+cast_source_set("cma_audio_output") {
+ sources = [
+ "cma_audio_output.cc",
+ "cma_audio_output.h",
+ ]
+
+ deps = [
+ "//base",
+ "//chromecast/base",
+ "//chromecast/common/mojom",
+ "//chromecast/media/base",
+ "//chromecast/media/cma/backend",
+ "//chromecast/media/cma/base",
+ "//chromecast/public/media",
+ "//media",
+ ]
+}
+
cast_source_set("audio") {
sources = [
"cast_audio_input_stream.cc",
@@ -74,11 +92,13 @@ cast_source_set("audio") {
deps = [
":audio_buildflags",
+ ":cma_audio_output",
"//base",
"//chromecast/base",
"//chromecast/common/mojom",
"//chromecast/media/api",
"//chromecast/media/audio/capture_service:receiver",
+ "//chromecast/media/audio/capture_service:utils",
"//chromecast/media/audio/mixer_service:common",
"//chromecast/media/audio/mixer_service:output_stream_connection",
"//chromecast/media/audio/mixer_service:proto",
@@ -103,6 +123,13 @@ cast_source_set("audio") {
]
}
+ if (is_android) {
+ sources += [
+ "cast_audio_manager_android.cc",
+ "cast_audio_manager_android.h",
+ ]
+ }
+
configs += [ "//media/audio:platform_config" ]
}
diff --git a/chromium/chromecast/media/cdm/BUILD.gn b/chromium/chromecast/media/cdm/BUILD.gn
index 571fd098017..c9175279598 100644
--- a/chromium/chromecast/media/cdm/BUILD.gn
+++ b/chromium/chromecast/media/cdm/BUILD.gn
@@ -33,3 +33,15 @@ cast_source_set("cdm") {
]
}
}
+
+cast_source_set("cdm_origin_provider") {
+ sources = [
+ "cast_cdm_origin_provider.cc",
+ "cast_cdm_origin_provider.h",
+ ]
+
+ deps = [
+ "//media/mojo/mojom",
+ "//mojo/public/cpp/bindings",
+ ]
+}
diff --git a/chromium/chromecast/media/cma/backend/desktop/BUILD.gn b/chromium/chromecast/media/cma/backend/desktop/BUILD.gn
index c4751417760..2c1e71214cf 100644
--- a/chromium/chromecast/media/cma/backend/desktop/BUILD.gn
+++ b/chromium/chromecast/media/cma/backend/desktop/BUILD.gn
@@ -36,3 +36,16 @@ cast_source_set("desktop") {
sources += [ "volume_control_desktop.cc" ]
}
}
+
+cast_source_set("mixer_output") {
+ sources = [
+ "mixer_output_stream_desktop.h",
+ "mixer_output_stream_desktop.cc"
+ ]
+ deps = [
+ "//base",
+ "//chromecast/public/media",
+ "//media",
+ ]
+}
+
diff --git a/chromium/chromecast/renderer/BUILD.gn b/chromium/chromecast/renderer/BUILD.gn
index 2fbd87926af..932535767d2 100644
--- a/chromium/chromecast/renderer/BUILD.gn
+++ b/chromium/chromecast/renderer/BUILD.gn
@@ -74,6 +74,8 @@ cast_source_set("renderer") {
"//gin",
"//ipc",
"//media",
+ "//media/remoting:remoting_constants",
+ "//media/remoting:remoting_renderer",
"//services/network/public/cpp:cpp",
"//services/service_manager/public/cpp",
"//v8",
diff --git a/chromium/chromecast/system/reboot/BUILD.gn b/chromium/chromecast/system/reboot/BUILD.gn
index a2bbb938a07..c36ba2a540a 100644
--- a/chromium/chromecast/system/reboot/BUILD.gn
+++ b/chromium/chromecast/system/reboot/BUILD.gn
@@ -13,10 +13,12 @@ cast_source_set("reboot_util") {
deps = [ "//base" ]
- if (chromecast_branding == "google" && !is_fuchsia) {
- deps += [ "//chromecast/internal/system/reboot:reboot_util" ]
- } else {
- sources += [ "reboot_util_dummy.cc" ]
+ if (!is_fuchsia) {
+ if (chromecast_branding == "google") {
+ deps += [ "//chromecast/internal/system/reboot:reboot_util" ]
+ } else {
+ sources += [ "reboot_util_dummy.cc" ]
+ }
}
if (is_android && chromecast_branding != "public") {
@@ -41,6 +43,19 @@ test("cast_reboot_unittests") {
"//testing/gmock",
"//testing/gtest",
]
+
+ if (is_fuchsia) {
+ sources += [ "reboot_fuchsia_test.cc" ]
+ deps += [
+ ":fuchsia",
+ "//chromecast/public",
+ "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.feedback",
+ "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.hardware.power.statecontrol",
+ "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.io",
+ "//third_party/fuchsia-sdk/sdk/pkg/fidl_cpp",
+ "//third_party/fuchsia-sdk/sdk/pkg/sys_cpp",
+ ]
+ }
}
# Target for OEM partners to override reboot shared library, i.e.
@@ -53,13 +68,19 @@ cast_shared_library("libcast_reboot_1.0") {
if (is_fuchsia) {
cast_source_set("fuchsia") {
- sources = [ "reboot_fuchsia.cc" ]
+ sources = [
+ "reboot_fuchsia.cc",
+ "reboot_fuchsia.h",
+ "reboot_util.h",
+ ]
public_deps = [ "//chromecast/public" ]
deps = [
"//base",
+ "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.feedback",
"//third_party/fuchsia-sdk/sdk/fidl/fuchsia.hardware.power.statecontrol",
"//third_party/fuchsia-sdk/sdk/pkg/fidl",
"//third_party/fuchsia-sdk/sdk/pkg/fidl_cpp",
+ "//third_party/fuchsia-sdk/sdk/pkg/sys_cpp",
]
}
}
diff --git a/chromium/chromecast/ui/BUILD.gn b/chromium/chromecast/ui/BUILD.gn
index ce674d948c3..ce2a33a5acc 100644
--- a/chromium/chromecast/ui/BUILD.gn
+++ b/chromium/chromecast/ui/BUILD.gn
@@ -57,6 +57,10 @@ cast_source_set("aura_components") {
} else {
sources += [ "aura_components_dummy.cc" ]
}
+
+ if (enable_media_overlay) {
+ defines = [ "ENABLE_MEDIA_OVERLAY" ]
+ }
}
if (use_aura) {
View Lorry Controller Status