diff options
Diffstat (limited to 'chromium/components/system_media_controls')
| -rw-r--r-- | chromium/components/system_media_controls/BUILD.gn | 17 | ||||
| -rw-r--r-- | chromium/components/system_media_controls/mac/now_playing_info_center_delegate.mm | 1 |
2 files changed, 3 insertions, 15 deletions
diff --git a/chromium/components/system_media_controls/BUILD.gn b/chromium/components/system_media_controls/BUILD.gn index a34bd8fc847..ebe31647dc0 100644 --- a/chromium/components/system_media_controls/BUILD.gn +++ b/chromium/components/system_media_controls/BUILD.gn @@ -4,15 +4,6 @@ import("linux/buildflags/buildflags.gni") -config("media_player_weak_link") { - ldflags = [ - "-weak_framework", - "MediaPlayer", - ] - - visibility = [ ":system_media_controls" ] -} - component("system_media_controls") { friend = [ ":unit_tests" ] @@ -61,13 +52,9 @@ component("system_media_controls") { "mac/system_media_controls_mac.mm", ] deps += [ "//build:branding_buildflags" ] - libs = [ "Foundation.framework" ] - # MediaPlayer.framework is only available on macOS 10.12 and higher. In a - # release build, component() is a static_library, which does not - # transitively carry weak_link information. Ensure that all targets that - # directly or indirectly carry the weak_link on the framework. - all_dependent_configs = [ ":media_player_weak_link" ] + frameworks = [ "Foundation.framework" ] + weak_frameworks = [ "MediaPlayer.framework" ] } else { sources = [ "system_media_controls_stub.cc" ] } diff --git a/chromium/components/system_media_controls/mac/now_playing_info_center_delegate.mm b/chromium/components/system_media_controls/mac/now_playing_info_center_delegate.mm index 13b1cbd5c17..bd08353cffb 100644 --- a/chromium/components/system_media_controls/mac/now_playing_info_center_delegate.mm +++ b/chromium/components/system_media_controls/mac/now_playing_info_center_delegate.mm @@ -6,6 +6,7 @@ #import <MediaPlayer/MediaPlayer.h> +#include "base/notreached.h" #include "base/strings/sys_string_conversions.h" #include "components/system_media_controls/mac/now_playing_info_center_delegate_cocoa.h" |