diff options
Diffstat (limited to 'chromium/media/cdm/library_cdm')
19 files changed, 47 insertions, 30 deletions
diff --git a/chromium/media/cdm/library_cdm/BUILD.gn b/chromium/media/cdm/library_cdm/BUILD.gn index a467704c4bc..0d75a55c97f 100644 --- a/chromium/media/cdm/library_cdm/BUILD.gn +++ b/chromium/media/cdm/library_cdm/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2018 The Chromium Authors. All rights reserved. +# Copyright 2018 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/chromium/media/cdm/library_cdm/cdm_host_proxy.h b/chromium/media/cdm/library_cdm/cdm_host_proxy.h index ac1ff8d5403..cc57326dc92 100644 --- a/chromium/media/cdm/library_cdm/cdm_host_proxy.h +++ b/chromium/media/cdm/library_cdm/cdm_host_proxy.h @@ -1,4 +1,4 @@ -// Copyright 2017 The Chromium Authors. All rights reserved. +// Copyright 2017 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/media/cdm/library_cdm/cdm_host_proxy_impl.h b/chromium/media/cdm/library_cdm/cdm_host_proxy_impl.h index 4ea7cee2b93..cb813946e91 100644 --- a/chromium/media/cdm/library_cdm/cdm_host_proxy_impl.h +++ b/chromium/media/cdm/library_cdm/cdm_host_proxy_impl.h @@ -1,4 +1,4 @@ -// Copyright 2017 The Chromium Authors. All rights reserved. +// Copyright 2017 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/media/cdm/library_cdm/cdm_paths.gni b/chromium/media/cdm/library_cdm/cdm_paths.gni index d18f179f04d..1dd10660f81 100644 --- a/chromium/media/cdm/library_cdm/cdm_paths.gni +++ b/chromium/media/cdm/library_cdm/cdm_paths.gni @@ -1,4 +1,4 @@ -# Copyright 2016 The Chromium Authors. All rights reserved. +# Copyright 2016 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -21,6 +21,8 @@ if (is_chromeos) { component_os = "win" } else if (is_mac) { component_os = "mac" +} else if (is_fuchsia) { + component_os = "fuchsia" } else { assert(false, "unsupported_platform") } @@ -31,15 +33,16 @@ component_arch = "$current_cpu" # components, but is optional for other platforms. # Note: # - |cdm_platform_specific_path| is exported as a BUILDFLAG to cdm_paths.cc. -if (is_fuchsia) { - cdm_platform_specific_path = "" - clearkey_cdm_path = "lib" - widevine_cdm_path = "lib" -} else { - cdm_platform_specific_path = - "_platform_specific/$component_os" + "_" + "$component_arch" +cdm_platform_specific_path = + "_platform_specific/$component_os" + "_" + "$component_arch" - # Path of Clear Key and Widevine CDMs relative to the output dir. - clearkey_cdm_path = "ClearKeyCdm/$cdm_platform_specific_path" - widevine_cdm_path = "WidevineCdm/$cdm_platform_specific_path" +# Path of Clear Key and Widevine CDMs relative to the output dir. +clearkey_cdm_path = "ClearKeyCdm/$cdm_platform_specific_path" +widevine_cdm_path = "WidevineCdm/$cdm_platform_specific_path" + +# Shared libraries must be within lib/ on Fuchsia. +# TODO(fxbug.dev/105910): Remove when the GN SDK drops this limitation. +if (is_fuchsia) { + clearkey_cdm_path = "lib/" + clearkey_cdm_path + widevine_cdm_path = "lib/" + clearkey_cdm_path } diff --git a/chromium/media/cdm/library_cdm/clear_key_cdm/BUILD.gn b/chromium/media/cdm/library_cdm/clear_key_cdm/BUILD.gn index 94deeb5ccec..37f6c3b6eef 100644 --- a/chromium/media/cdm/library_cdm/clear_key_cdm/BUILD.gn +++ b/chromium/media/cdm/library_cdm/clear_key_cdm/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2014 The Chromium Authors. All rights reserved. +# Copyright 2014 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -8,7 +8,7 @@ import("//media/media_options.gni") assert(enable_library_cdms) -loadable_module("clear_key_cdm") { +loadable_module("clear_key_cdm_bin") { testonly = true output_dir = "$root_out_dir/$clearkey_cdm_path" output_name = "clearkeycdm" @@ -48,3 +48,17 @@ loadable_module("clear_key_cdm") { deps += [ "//third_party/ffmpeg" ] } } + +group("clear_key_cdm") { + testonly = true + deps = [ ":clear_key_cdm_bin" ] + if (is_fuchsia) { + # Tests that need the CDM binary must include this target in their + # `data_deps`. Due to the unique path of CDMs, the Fuchsia SDK will include + # the unstripped binary (see fxbug.dev/105910). Therefore, targets that + # depend on this one must add the unstripped library path to + # `excluded_files` when `is_fuchsia` to prevent the unstripped binary from + # being added to the package. + data = [ "$root_out_dir/$clearkey_cdm_path/libclearkeycdm.so" ] + } +} diff --git a/chromium/media/cdm/library_cdm/clear_key_cdm/cdm_file_adapter.cc b/chromium/media/cdm/library_cdm/clear_key_cdm/cdm_file_adapter.cc index f5d28505eb0..4bb44a9e9f4 100644 --- a/chromium/media/cdm/library_cdm/clear_key_cdm/cdm_file_adapter.cc +++ b/chromium/media/cdm/library_cdm/clear_key_cdm/cdm_file_adapter.cc @@ -1,4 +1,4 @@ -// Copyright 2017 The Chromium Authors. All rights reserved. +// Copyright 2017 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/media/cdm/library_cdm/clear_key_cdm/cdm_file_adapter.h b/chromium/media/cdm/library_cdm/clear_key_cdm/cdm_file_adapter.h index 9ce43358bed..b9e3dd261d0 100644 --- a/chromium/media/cdm/library_cdm/clear_key_cdm/cdm_file_adapter.h +++ b/chromium/media/cdm/library_cdm/clear_key_cdm/cdm_file_adapter.h @@ -1,4 +1,4 @@ -// Copyright 2017 The Chromium Authors. All rights reserved. +// Copyright 2017 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/media/cdm/library_cdm/clear_key_cdm/cdm_file_io_test.cc b/chromium/media/cdm/library_cdm/clear_key_cdm/cdm_file_io_test.cc index aaacfb1f568..868dcc0b5e1 100644 --- a/chromium/media/cdm/library_cdm/clear_key_cdm/cdm_file_io_test.cc +++ b/chromium/media/cdm/library_cdm/clear_key_cdm/cdm_file_io_test.cc @@ -1,4 +1,4 @@ -// Copyright 2013 The Chromium Authors. All rights reserved. +// Copyright 2013 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/media/cdm/library_cdm/clear_key_cdm/cdm_file_io_test.h b/chromium/media/cdm/library_cdm/clear_key_cdm/cdm_file_io_test.h index f4d5a40772f..b8ad857e58a 100644 --- a/chromium/media/cdm/library_cdm/clear_key_cdm/cdm_file_io_test.h +++ b/chromium/media/cdm/library_cdm/clear_key_cdm/cdm_file_io_test.h @@ -1,4 +1,4 @@ -// Copyright 2013 The Chromium Authors. All rights reserved. +// Copyright 2013 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/media/cdm/library_cdm/clear_key_cdm/cdm_video_decoder.cc b/chromium/media/cdm/library_cdm/clear_key_cdm/cdm_video_decoder.cc index 15166819bdb..69d46cb3c41 100644 --- a/chromium/media/cdm/library_cdm/clear_key_cdm/cdm_video_decoder.cc +++ b/chromium/media/cdm/library_cdm/clear_key_cdm/cdm_video_decoder.cc @@ -1,4 +1,4 @@ -// Copyright 2013 The Chromium Authors. All rights reserved. +// Copyright 2013 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/media/cdm/library_cdm/clear_key_cdm/cdm_video_decoder.h b/chromium/media/cdm/library_cdm/clear_key_cdm/cdm_video_decoder.h index 133af1fcaa6..ceea9df04fd 100644 --- a/chromium/media/cdm/library_cdm/clear_key_cdm/cdm_video_decoder.h +++ b/chromium/media/cdm/library_cdm/clear_key_cdm/cdm_video_decoder.h @@ -1,4 +1,4 @@ -// Copyright 2013 The Chromium Authors. All rights reserved. +// Copyright 2013 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/media/cdm/library_cdm/clear_key_cdm/clear_key_cdm.cc b/chromium/media/cdm/library_cdm/clear_key_cdm/clear_key_cdm.cc index 5461f9833bc..f5f07034029 100644 --- a/chromium/media/cdm/library_cdm/clear_key_cdm/clear_key_cdm.cc +++ b/chromium/media/cdm/library_cdm/clear_key_cdm/clear_key_cdm.cc @@ -1,4 +1,4 @@ -// Copyright 2013 The Chromium Authors. All rights reserved. +// Copyright 2013 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/media/cdm/library_cdm/clear_key_cdm/clear_key_cdm.h b/chromium/media/cdm/library_cdm/clear_key_cdm/clear_key_cdm.h index ef478f6e648..0348d5e1335 100644 --- a/chromium/media/cdm/library_cdm/clear_key_cdm/clear_key_cdm.h +++ b/chromium/media/cdm/library_cdm/clear_key_cdm/clear_key_cdm.h @@ -1,4 +1,4 @@ -// Copyright 2013 The Chromium Authors. All rights reserved. +// Copyright 2013 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/media/cdm/library_cdm/clear_key_cdm/clear_key_persistent_session_cdm.cc b/chromium/media/cdm/library_cdm/clear_key_cdm/clear_key_persistent_session_cdm.cc index ea19b0b1dbf..0385ac972b9 100644 --- a/chromium/media/cdm/library_cdm/clear_key_cdm/clear_key_persistent_session_cdm.cc +++ b/chromium/media/cdm/library_cdm/clear_key_cdm/clear_key_persistent_session_cdm.cc @@ -1,4 +1,4 @@ -// Copyright 2017 The Chromium Authors. All rights reserved. +// Copyright 2017 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/media/cdm/library_cdm/clear_key_cdm/clear_key_persistent_session_cdm.h b/chromium/media/cdm/library_cdm/clear_key_cdm/clear_key_persistent_session_cdm.h index e1f800875bc..fca9452810d 100644 --- a/chromium/media/cdm/library_cdm/clear_key_cdm/clear_key_persistent_session_cdm.h +++ b/chromium/media/cdm/library_cdm/clear_key_cdm/clear_key_persistent_session_cdm.h @@ -1,4 +1,4 @@ -// Copyright 2017 The Chromium Authors. All rights reserved. +// Copyright 2017 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/media/cdm/library_cdm/clear_key_cdm/ffmpeg_cdm_audio_decoder.cc b/chromium/media/cdm/library_cdm/clear_key_cdm/ffmpeg_cdm_audio_decoder.cc index 9b1ad9f7675..eb7765ec30b 100644 --- a/chromium/media/cdm/library_cdm/clear_key_cdm/ffmpeg_cdm_audio_decoder.cc +++ b/chromium/media/cdm/library_cdm/clear_key_cdm/ffmpeg_cdm_audio_decoder.cc @@ -1,4 +1,4 @@ -// Copyright 2013 The Chromium Authors. All rights reserved. +// Copyright 2013 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/media/cdm/library_cdm/clear_key_cdm/ffmpeg_cdm_audio_decoder.h b/chromium/media/cdm/library_cdm/clear_key_cdm/ffmpeg_cdm_audio_decoder.h index 9bb56b9a41c..be4d7e5ca0f 100644 --- a/chromium/media/cdm/library_cdm/clear_key_cdm/ffmpeg_cdm_audio_decoder.h +++ b/chromium/media/cdm/library_cdm/clear_key_cdm/ffmpeg_cdm_audio_decoder.h @@ -1,4 +1,4 @@ -// Copyright 2013 The Chromium Authors. All rights reserved. +// Copyright 2013 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/media/cdm/library_cdm/mock_library_cdm.cc b/chromium/media/cdm/library_cdm/mock_library_cdm.cc index 46a1c576e60..df90fd6d135 100644 --- a/chromium/media/cdm/library_cdm/mock_library_cdm.cc +++ b/chromium/media/cdm/library_cdm/mock_library_cdm.cc @@ -1,4 +1,4 @@ -// Copyright 2018 The Chromium Authors. All rights reserved. +// Copyright 2018 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/media/cdm/library_cdm/mock_library_cdm.h b/chromium/media/cdm/library_cdm/mock_library_cdm.h index 032a5cdcbae..2b2fa2db5d9 100644 --- a/chromium/media/cdm/library_cdm/mock_library_cdm.h +++ b/chromium/media/cdm/library_cdm/mock_library_cdm.h @@ -1,4 +1,4 @@ -// Copyright 2018 The Chromium Authors. All rights reserved. +// Copyright 2018 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. |