From e684a3455bcc29a6e3e66a004e352dea4e1141e7 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Wed, 13 Feb 2019 15:05:36 +0100 Subject: BASELINE: Update Chromium to 72.0.3626.110 and Ninja to 1.9.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ic57220b00ecc929a893c91f5cc552f5d3e99e922 Reviewed-by: Michael Brüning --- chromium/chromecast/BUILD.gn | 60 ++++++++++------------ chromium/chromecast/android/BUILD.gn | 1 + chromium/chromecast/base/BUILD.gn | 3 +- chromium/chromecast/browser/BUILD.gn | 32 +++++++++++- chromium/chromecast/browser/android/BUILD.gn | 9 ++-- chromium/chromecast/chromecast.gni | 8 ++- chromium/chromecast/common/extensions_api/BUILD.gn | 1 + chromium/chromecast/common/media/BUILD.gn | 5 +- chromium/chromecast/graphics/BUILD.gn | 9 +++- chromium/chromecast/media/BUILD.gn | 5 +- chromium/chromecast/media/audio/BUILD.gn | 2 + .../chromecast/media/audio/mixer_service/BUILD.gn | 2 + chromium/chromecast/media/base/BUILD.gn | 6 +-- chromium/chromecast/media/cdm/BUILD.gn | 2 +- chromium/chromecast/media/cma/backend/BUILD.gn | 2 + .../media/cma/backend/post_processors/BUILD.gn | 4 +- .../chromecast/media/cma/backend/video/BUILD.gn | 6 ++- chromium/chromecast/media/cma/base/BUILD.gn | 2 +- chromium/chromecast/renderer/BUILD.gn | 6 +-- chromium/chromecast/tracing/BUILD.gn | 1 + 20 files changed, 105 insertions(+), 61 deletions(-) (limited to 'chromium/chromecast') diff --git a/chromium/chromecast/BUILD.gn b/chromium/chromecast/BUILD.gn index d1cb014dc62..897b7f95744 100644 --- a/chromium/chromecast/BUILD.gn +++ b/chromium/chromecast/BUILD.gn @@ -2,7 +2,6 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//base/android/jni_generator/jni_exception_list.gni") import("//build/buildflag_header.gni") import("//build/config/features.gni") import("//build/config/sanitizers/sanitizers.gni") @@ -22,12 +21,6 @@ declare_args() { cast_test_extra_flags = "" } -config("playready_config") { - if (use_playready) { - defines = [ "PLAYREADY_CDM_AVAILABLE" ] - } -} - # Depends on all non-test targets that should be built by the Chromecast # internal build infrastructure. group("all") { @@ -141,6 +134,15 @@ cast_test_group("cast_tests") { "--enable-local-file-accesses", "--test-launcher-jobs=1", ] + + gtest_excludes = [] + + # TODO(b/112440248): This test was failing: + # * On v1 and Cast Audio devices since 2017-03-15. + # * On desktop builds since 2018-08-22 + # Also see: b/36238710, b/36239051, hotlist/461351 + gtest_excludes += [ "RendererPrelauncherTest.ReusedRenderer" ] + if (!is_cast_desktop_build) { args += [ "--use-gpu-in-tests" ] @@ -148,19 +150,10 @@ cast_test_group("cast_tests") { # Once all of the CastMediaBlockerTest.* have been un-DISABLEd and # are running successfully, revisit these tests and see if they pass # on devices. (crbug/665118, internal b/32023194) - gtest_excludes = [ + gtest_excludes += [ "CastMediaBlockerBrowserTest.Video_BlockUnblock", "CastMediaBlockerBrowserTest.Audio_BlockUnblock", ] - - # TODO(mbjorge): The ReusedRenderer test is failing on v1 and cast audio - # devices. Temporarily disable them as part of an effort_to re-green - # the unittests. Current failures (2017-03-15) are being disabled to get - # back to a green state. Re-enable once the tests have been fixed. - # Limitations in the build mean this unfortunately is getting disabled - # across all devices, even though it is only failing on some. - # b/36238710, b/36239051, hotlist/461351 - gtest_excludes += [ "RendererPrelauncherTest.ReusedRenderer" ] } if (!is_cast_desktop_build && !is_cast_audio_only && !enable_assistant) { @@ -208,11 +201,8 @@ cast_test_group("cast_tests") { gtest_excludes = [] if (target_os == "linux") { if (is_cast_desktop_build) { - # Disable PartitionAllocDeathTest.Repeated*ReturnNullDirect (b/67975693) - gtest_excludes += [ - "PartitionAllocDeathTest.RepeatedAllocReturnNullDirect", - "PartitionAllocDeathTest.RepeatedReallocReturnNullDirect", - ] + # Disable PartitionAllocDeathTest.* (b/67975693) + gtest_excludes += [ "PartitionAllocDeathTest.*" ] } else { # Disable ProcessMetricsTest.GetNumberOfThreads (b/15610509) # Disable ProcessUtilTest.* (need to define OS_ANDROID) @@ -241,11 +231,15 @@ cast_test_group("cast_tests") { cc_unittests_filter = { test_name = "cc_unittests" + + # Temporarily disable all test cases (b/113324890) + gtest_excludes = [ "*" ] + if (!is_cast_desktop_build) { #Disable ToColorSpace/ColorTransformPixelTest* (b/64346790) #Disable ImageBackgroundFilter* (b/64346875) #Disable LayerTreeHostTilesTestPartialInvalidation* (b/65844132) - gtest_excludes = [ + gtest_excludes += [ "ToColorSpace/ColorTransformPixelTest.*", "ImageBackgroundFilter.*", "LayerTreeHostTilesTestPartialInvalidation.*", @@ -577,30 +571,32 @@ group("chromecast_locales_pak") { buildflag_header("chromecast_buildflags") { header = "chromecast_buildflags.h" flags = [ + "DEFAULT_COMMAND_LINE_FLAGS=\"$default_command_line_flags\"", + "DISABLE_SECURE_FLAC_OPUS_DECODING=$disable_secure_flac_and_opus_decoding", "ENABLE_ASSISTANT=$enable_assistant", + "ENABLE_CAST_FRAGMENT=$enable_cast_fragment", + "ENABLE_CAST_WAYLAND_SERVER=$enable_cast_wayland_server", + "ENABLE_CHROMECAST_EXTENSIONS=$enable_chromecast_extensions", + "ENABLE_HEADLESS_MUSIC_MODE=$enable_headless_music_mode", + "ENABLE_PLAYREADY=$enable_playready", "ENABLE_VOLUME_TABLES_ACCESS=$enable_volume_tables_access", "IS_ANDROID_THINGS=$is_android_things", + "IS_ANDROID_THINGS_NON_PUBLIC=$is_android_things_non_public", "IS_CAST_AUDIO_ONLY=$is_cast_audio_only", "IS_CAST_DESKTOP_BUILD=$is_cast_desktop_build", "IS_CAST_USING_CMA_BACKEND=$is_cast_using_cma_backend", - "SUPPORTS_MULTIZONE=$supports_multizone", - "ENABLE_HEADLESS_MUSIC_MODE=$enable_headless_music_mode", - "ENABLE_CHROMECAST_EXTENSIONS=$enable_chromecast_extensions", - "ENABLE_CAST_FRAGMENT=$enable_cast_fragment", - "IS_ANDROID_THINGS_NON_PUBLIC=$is_android_things_non_public", "IS_SINGLE_VOLUME=$is_single_volume", + "SUPPORTS_MULTIZONE=$supports_multizone", "USE_ANDROID_USER_AGENT=$use_android_user_agent", "USE_CHROMECAST_CDMS=$use_chromecast_cdms", - "DEFAULT_COMMAND_LINE_FLAGS=\"$default_command_line_flags\"", - "DISABLE_SECURE_FLAC_OPUS_DECODING=$disable_secure_flac_and_opus_decoding", + "USE_ANDROID_THINGS_N=$build_for_android_things_n", ] } if (is_android) { generate_jni_registration("cast_shell_jni_registration") { target = ":cast_shell_apk" - output = "$root_gen_dir/chromecast/android/${target_name}.h" - exception_files = jni_exception_files + header_output = "$root_gen_dir/chromecast/android/${target_name}.h" } android_assets("cast_shell_apk_assets") { diff --git a/chromium/chromecast/android/BUILD.gn b/chromium/chromecast/android/BUILD.gn index 6bc8eed5dc2..1e2ae171ca1 100644 --- a/chromium/chromecast/android/BUILD.gn +++ b/chromium/chromecast/android/BUILD.gn @@ -25,6 +25,7 @@ cast_shared_library("libcast_shell_android") { "//chromecast/base:jni_headers", "//chromecast/base/metrics", "//chromecast/browser", + "//components/crash/android:crash_android", "//content/public/app:both", "//content/public/browser", "//skia", diff --git a/chromium/chromecast/base/BUILD.gn b/chromium/chromecast/base/BUILD.gn index 5955fdea1ce..f8fee005e63 100644 --- a/chromium/chromecast/base/BUILD.gn +++ b/chromium/chromecast/base/BUILD.gn @@ -199,8 +199,7 @@ cast_source_set("cast_sys_info") { "cast_sys_info_android.h", "cast_sys_info_android_factory.cc", ] - - if (is_android_things) { + if (is_android_things && !build_for_android_things_n) { sources += [ "cast_sys_info_android_things.cc", "cast_sys_info_android_things.h", diff --git a/chromium/chromecast/browser/BUILD.gn b/chromium/chromecast/browser/BUILD.gn index 665d5c64610..31808a4a2bc 100644 --- a/chromium/chromecast/browser/BUILD.gn +++ b/chromium/chromecast/browser/BUILD.gn @@ -33,6 +33,8 @@ cast_source_set("browser") { "cast_content_gesture_handler.h", "cast_download_manager_delegate.cc", "cast_download_manager_delegate.h", + "cast_feature_list_creator.cc", + "cast_feature_list_creator.h", "cast_http_user_agent_settings.cc", "cast_http_user_agent_settings.h", "cast_media_blocker.cc", @@ -51,6 +53,10 @@ cast_source_set("browser") { "cast_quota_permission_context.h", "cast_resource_dispatcher_host_delegate.cc", "cast_resource_dispatcher_host_delegate.h", + "cast_session_id_map.cc", + "cast_session_id_map.h", + "cast_web_contents_impl.cc", + "cast_web_contents_impl.h", "cast_web_contents_manager.cc", "cast_web_contents_manager.h", "cast_web_view_default.cc", @@ -257,6 +263,8 @@ cast_source_set("browser") { "extensions/api/identity/identity_api.h", "extensions/api/notifications/notifications_api.cc", "extensions/api/notifications/notifications_api.h", + "extensions/api/settings_private/settings_private_api.cc", + "extensions/api/settings_private/settings_private_api.h", "extensions/api/tabs/tabs_api.cc", "extensions/api/tabs/tabs_api.h", "extensions/api/tabs/tabs_constants.cc", @@ -325,6 +333,17 @@ cast_source_set("browser") { ] } + if (enable_cast_wayland_server) { + sources += [ + "exo/wm_helper_cast_shell.cc", + "exo/wm_helper_cast_shell.h", + ] + deps += [ + "//components/exo", + "//components/exo/wayland", + ] + } + configs += [ "//media/audio:platform_config" ] } @@ -334,6 +353,7 @@ cast_source_set("public") { sources = [ "cast_content_window.cc", "cast_content_window.h", + "cast_web_contents.h", "cast_web_view.cc", "cast_web_view.h", ] @@ -376,6 +396,10 @@ service_manifest("cast_content_browser_manifest_overlay") { # interfaces in "content_renderer". service_manifest("cast_content_renderer_manifest_overlay") { source = "cast_content_renderer_manifest_overlay.json" + + if (chromecast_branding != "public") { + overlays = [ "//chromecast/internal/shell/browser:cast_content_renderer_internal_manifest_overlay" ] + } } # This target is for packaged services that will run in the main (browser) @@ -475,7 +499,7 @@ cast_source_set("unittests") { "bluetooth/cast_bluetooth_chooser_unittest.cc", "cast_media_blocker_unittest.cc", "cast_network_delegate_unittest.cc", - "cast_touch_device_manager_unittest.cc", + "cast_session_id_map_unittest.cc", "devtools/cast_devtools_manager_delegate_unittest.cc", "lru_renderer_cache_test.cc", "network_context_manager_unittest.cc", @@ -493,6 +517,10 @@ cast_source_set("unittests") { "//ui/gl:test_support", ] + if (!is_android) { + sources += [ "cast_touch_device_manager_unittest.cc" ] + } + if (enable_chromecast_extensions && use_aura) { sources += [ "accessibility/touch_exploration_controller_unittest.cc" ] deps += [ @@ -511,7 +539,7 @@ if (is_android) { "android/apk/src/org/chromium/chromecast/shell/CastSysInfoAndroid.java", ] - if (is_android_things_non_public) { + if (is_android_things_non_public && !build_for_android_things_n) { sources += [ "android/apk/src/org/chromium/chromecast/shell/CastSysInfoAndroidThings.java" ] } diff --git a/chromium/chromecast/browser/android/BUILD.gn b/chromium/chromecast/browser/android/BUILD.gn index 345d20e48b2..77884cdc682 100644 --- a/chromium/chromecast/browser/android/BUILD.gn +++ b/chromium/chromecast/browser/android/BUILD.gn @@ -11,8 +11,10 @@ assert(is_android) cast_shell_android_manifest = "$root_gen_dir/cast_shell_manifest/AndroidManifest.xml" -manifest_variables = - [ "cast_build_enable_background_activities=$enable_background_activities" ] +manifest_variables = [ + "cast_build_enable_background_activities=$enable_background_activities", + "is_android_things_non_public=$is_android_things_non_public", +] jinja_template("cast_shell_manifest") { input = "apk/AndroidManifest.xml.jinja2" @@ -116,6 +118,7 @@ android_library("cast_shell_java") { "$java_src_dir/org/chromium/chromecast/shell/CastWebContentsIntentUtils.java", "$java_src_dir/org/chromium/chromecast/shell/CastWebContentsService.java", "$java_src_dir/org/chromium/chromecast/shell/CastWebContentsSurfaceHelper.java", + "$java_src_dir/org/chromium/chromecast/shell/CastWebContentsScopes.java", "$java_src_dir/org/chromium/chromecast/shell/CastWebContentsView.java", "$java_src_dir/org/chromium/chromecast/shell/LogcatElision.java", "$java_src_dir/org/chromium/chromecast/shell/ElidedLogcatProvider.java", @@ -152,7 +155,7 @@ android_library("cast_shell_java") { deps += [ "//chromecast/media/cma/backend/android:audio_track_java" ] } - if (is_android_things_non_public) { + if (is_android_things_non_public && !build_for_android_things_n) { java_files += [ "$java_src_dir/org/chromium/chromecast/shell/CastSysInfoAndroidThings.java" ] deps += [ "//chromecast/internal/android/prebuilt/things:support_lib_java" ] if (enable_assistant) { diff --git a/chromium/chromecast/chromecast.gni b/chromium/chromecast/chromecast.gni index fef8c70163b..02a14ffc87d 100644 --- a/chromium/chromecast/chromecast.gni +++ b/chromium/chromecast/chromecast.gni @@ -98,6 +98,12 @@ declare_args() { # Set to true to disable secure flac/opus support in EME, when using # cast CMA media backend and supporting Widevine or Playready. disable_secure_flac_and_opus_decoding = false + + # Set to true to enable wayland server + enable_cast_wayland_server = false + + # Whether to build cast for Android Things N version + build_for_android_things_n = false } declare_args() { @@ -109,7 +115,7 @@ declare_args() { declare_args() { # Use Playready CDMs for internal non-desktop builds. - use_playready = !is_cast_desktop_build && chromecast_branding != "public" + enable_playready = !is_cast_desktop_build && chromecast_branding != "public" } # This is the release version, which takes the form .. Internal diff --git a/chromium/chromecast/common/extensions_api/BUILD.gn b/chromium/chromecast/common/extensions_api/BUILD.gn index 927efac41e7..88f14a4268b 100644 --- a/chromium/chromecast/common/extensions_api/BUILD.gn +++ b/chromium/chromecast/common/extensions_api/BUILD.gn @@ -23,6 +23,7 @@ schema_sources = [ "identity.idl", "i18n.json", "notifications.idl", + "settings_private.idl", "tabs.json", "windows.json", ] diff --git a/chromium/chromecast/common/media/BUILD.gn b/chromium/chromecast/common/media/BUILD.gn index 2b42534f9eb..30a7808637b 100644 --- a/chromium/chromecast/common/media/BUILD.gn +++ b/chromium/chromecast/common/media/BUILD.gn @@ -13,14 +13,11 @@ cast_source_set("media") { ] deps = [ "//base", + "//chromecast:chromecast_buildflags", "//chromecast/media", "//chromecast/media/cdm", "//components/cdm/common", "//media", ] } - - if (use_playready) { - public_configs = [ "//chromecast:playready_config" ] - } } diff --git a/chromium/chromecast/graphics/BUILD.gn b/chromium/chromecast/graphics/BUILD.gn index d241a63fd19..a884b3abc24 100644 --- a/chromium/chromecast/graphics/BUILD.gn +++ b/chromium/chromecast/graphics/BUILD.gn @@ -2,8 +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") import("//build/config/ui.gni") +import("//chromecast/chromecast.gni") import("//testing/test.gni") cast_source_set("graphics") { @@ -43,6 +43,8 @@ cast_source_set("graphics") { "accessibility/magnification_controller.h", "accessibility/partial_magnification_controller.cc", "accessibility/partial_magnification_controller.h", + "cast_display_util.cc", + "cast_display_util.h", "cast_focus_client_aura.cc", "cast_focus_client_aura.h", "cast_touch_event_gate.cc", @@ -91,6 +93,10 @@ cast_source_set("graphics") { "//ui/platform_window", ] } + + if (use_ozone) { + deps += [ "//ui/ozone" ] + } } cast_shared_library("libcast_graphics_1.0") { @@ -116,6 +122,7 @@ if (use_aura && !is_cast_audio_only) { sources = [ "accessibility/accessibility_focus_ring_controller_unittest.cc", "accessibility/partial_magnification_controller_unittest.cc", + "cast_display_util_unittest.cc", "cast_focus_client_aura_test.cc", "cast_touch_event_gate_test.cc", "cast_views_test.cc", diff --git a/chromium/chromecast/media/BUILD.gn b/chromium/chromecast/media/BUILD.gn index 9a408421064..49762d7903e 100644 --- a/chromium/chromecast/media/BUILD.gn +++ b/chromium/chromecast/media/BUILD.gn @@ -78,7 +78,10 @@ test("cast_media_unittests") { if (is_cast_using_cma_backend) { deps += [ "//chromecast/media/cma:unittests" ] if (is_android) { - deps += [ "//chromecast/media/cma/backend/android:audio_track_java" ] + deps += [ + "//chromecast/media/cma/backend/android:audio_track_java", + "//media/base/android:media_java", + ] shard_timeout = 300 } } diff --git a/chromium/chromecast/media/audio/BUILD.gn b/chromium/chromecast/media/audio/BUILD.gn index d19d4476496..0539098e5c5 100644 --- a/chromium/chromecast/media/audio/BUILD.gn +++ b/chromium/chromecast/media/audio/BUILD.gn @@ -19,6 +19,8 @@ cast_source_set("audio") { "//base", "//chromecast/base", "//chromecast/common/mojom", + "//chromecast/media/audio/mixer_service:connection", + "//chromecast/media/audio/mixer_service:proto", "//chromecast/media/base", "//chromecast/media/cma/backend", "//chromecast/media/cma/base", diff --git a/chromium/chromecast/media/audio/mixer_service/BUILD.gn b/chromium/chromecast/media/audio/mixer_service/BUILD.gn index 091225b4866..da9778b6206 100644 --- a/chromium/chromecast/media/audio/mixer_service/BUILD.gn +++ b/chromium/chromecast/media/audio/mixer_service/BUILD.gn @@ -40,6 +40,8 @@ cast_source_set("connection") { sources = [ "mixer_service_connection.cc", "mixer_service_connection.h", + "mixer_service_connection_factory.cc", + "mixer_service_connection_factory.h", ] deps = [ diff --git a/chromium/chromecast/media/base/BUILD.gn b/chromium/chromecast/media/base/BUILD.gn index 450a06d21cb..2b3982397ea 100644 --- a/chromium/chromecast/media/base/BUILD.gn +++ b/chromium/chromecast/media/base/BUILD.gn @@ -11,12 +11,9 @@ cast_source_set("key_systems") { "key_systems_common.h", ] - if (use_playready) { - public_configs = [ "//chromecast:playready_config" ] - } - deps = [ "//base", + "//chromecast:chromecast_buildflags", "//chromecast/public/media", "//media", "//third_party/widevine/cdm:buildflags", @@ -29,6 +26,7 @@ cast_source_set("key_systems") { cast_source_set("base") { sources = [ + "aligned_buffer.h", "audio_device_ids.cc", "audio_device_ids.h", "decrypt_context_impl.cc", diff --git a/chromium/chromecast/media/cdm/BUILD.gn b/chromium/chromecast/media/cdm/BUILD.gn index 5e524e9c60d..543fd6db405 100644 --- a/chromium/chromecast/media/cdm/BUILD.gn +++ b/chromium/chromecast/media/cdm/BUILD.gn @@ -34,7 +34,7 @@ cast_source_set("cdm") { ] } - if (is_android && use_playready) { + if (is_android && enable_playready) { sources += [ "playready_drm_delegate_android.cc", "playready_drm_delegate_android.h", diff --git a/chromium/chromecast/media/cma/backend/BUILD.gn b/chromium/chromecast/media/cma/backend/BUILD.gn index 35c73b53c52..d3733d8ac7b 100644 --- a/chromium/chromecast/media/cma/backend/BUILD.gn +++ b/chromium/chromecast/media/cma/backend/BUILD.gn @@ -259,6 +259,8 @@ test("cast_audio_backend_unittests") { "filter_group_unittest.cc", "mock_mixer_source.cc", "mock_mixer_source.h", + "mock_post_processor_factory.cc", + "mock_post_processor_factory.h", "mock_redirected_audio_output.cc", "mock_redirected_audio_output.h", "stream_mixer_external_audio_pipeline_unittest.cc", diff --git a/chromium/chromecast/media/cma/backend/post_processors/BUILD.gn b/chromium/chromecast/media/cma/backend/post_processors/BUILD.gn index b6eab39a343..ec7def2fc90 100644 --- a/chromium/chromecast/media/cma/backend/post_processors/BUILD.gn +++ b/chromium/chromecast/media/cma/backend/post_processors/BUILD.gn @@ -83,14 +83,13 @@ cast_source_set("saturated_gain") { cast_source_set("test_support") { testonly = true sources = [ - "post_processor_benchmark.cc", - "post_processor_benchmark.h", "post_processor_unittest.cc", "post_processor_unittest.h", ] deps = [ ":post_processor_wrapper", "//base", + "//chromecast/media/base", "//chromecast/public/media", "//testing/gtest", ] @@ -108,6 +107,7 @@ cast_source_set("unittests") { ":saturated_gain", ":test_support", "//base", + "//chromecast/media/base", "//chromecast/public", "//chromecast/public/media", "//testing/gtest:gtest", diff --git a/chromium/chromecast/media/cma/backend/video/BUILD.gn b/chromium/chromecast/media/cma/backend/video/BUILD.gn index 762bcb8f427..2a04a24eca2 100644 --- a/chromium/chromecast/media/cma/backend/video/BUILD.gn +++ b/chromium/chromecast/media/cma/backend/video/BUILD.gn @@ -37,8 +37,6 @@ cast_source_set("cast_media_shlib_common") { "cast_media_shlib_common.cc", ] deps = [ - "//chromecast/media/cma/backend:for_mixer_audio", - "//chromecast/public", "//chromecast/public/media", ] } @@ -72,4 +70,8 @@ cast_shared_library("libcast_media_1.0_avsync") { deps += [ "//chromecast/media/cma/backend/alsa:cma_backend_support" ] libs = [ "videodecoderformixer" ] } + + if (is_fuchsia) { + deps += [ "//chromecast/media/cma/backend:null_video" ] + } } diff --git a/chromium/chromecast/media/cma/base/BUILD.gn b/chromium/chromecast/media/cma/base/BUILD.gn index 220286d09d7..0b322cb8242 100644 --- a/chromium/chromecast/media/cma/base/BUILD.gn +++ b/chromium/chromecast/media/cma/base/BUILD.gn @@ -18,7 +18,6 @@ cast_source_set("base") { "buffering_state.h", "cast_decrypt_config_impl.cc", "cast_decrypt_config_impl.h", - "cma_logging.h", "coded_frame_provider.cc", "coded_frame_provider.h", "decoder_buffer_adapter.cc", @@ -47,5 +46,6 @@ cast_source_set("base") { "//chromecast/media/base:media_codec_support", "//media", "//media:shared_memory_support", + "//ui/gfx", ] } diff --git a/chromium/chromecast/renderer/BUILD.gn b/chromium/chromecast/renderer/BUILD.gn index cd88cecaf2f..fd3e68bbfef 100644 --- a/chromium/chromecast/renderer/BUILD.gn +++ b/chromium/chromecast/renderer/BUILD.gn @@ -18,7 +18,7 @@ grit("extensions_resources") { "mojom_root=" + rebase_path(root_gen_dir, root_build_dir), ] deps = [ - "//net/interfaces:interfaces_js", + "//services/network/public/mojom:mojom_js", "//url/mojom:url_mojom_gurl_js", "//url/mojom:url_mojom_origin_js", ] @@ -40,10 +40,6 @@ cast_source_set("renderer") { sources += [ "cast_content_renderer_client_simple.cc" ] } - if (use_playready) { - configs += [ "//chromecast:playready_config" ] - } - deps = [ "//base", "//chromecast:chromecast_buildflags", diff --git a/chromium/chromecast/tracing/BUILD.gn b/chromium/chromecast/tracing/BUILD.gn index 4893411bf32..f3f408aa3b6 100644 --- a/chromium/chromecast/tracing/BUILD.gn +++ b/chromium/chromecast/tracing/BUILD.gn @@ -40,6 +40,7 @@ cast_source_set("system_tracer") { public_deps = [ ":system_tracing_common", "//base", + "//chromecast:chromecast_buildflags", ] } -- cgit v1.2.1