| Index: third_party/widevine/cdm/BUILD.gn
|
| diff --git a/third_party/widevine/cdm/BUILD.gn b/third_party/widevine/cdm/BUILD.gn
|
| index ecf32517ea0df812df4eb22c90fd2ea8af9389a9..b5aa3deebb5c954539eea84f05731a6d3b1719e8 100644
|
| --- a/third_party/widevine/cdm/BUILD.gn
|
| +++ b/third_party/widevine/cdm/BUILD.gn
|
| @@ -14,29 +14,20 @@ if (is_android) {
|
| } else if (is_chrome_branded) {
|
| if (is_chromeos) {
|
| widevine_cdm_version_h_file =
|
| - "chromeos/$widevine_arch/widevine_cdm_version.h"
|
| - widevine_cdm_binary_files = [
|
| - "chromeos/$widevine_arch/libwidevinecdm.so",
|
| - ]
|
| + "chromeos/$widevine_arch/widevine_cdm_version.h"
|
| + widevine_cdm_binary_files = [ "chromeos/$widevine_arch/libwidevinecdm.so" ]
|
| } else if (is_linux) {
|
| - widevine_cdm_version_h_file =
|
| - "linux/$widevine_arch/widevine_cdm_version.h"
|
| - widevine_cdm_binary_files = [
|
| - "linux/$widevine_arch/libwidevinecdm.so",
|
| - ]
|
| + widevine_cdm_version_h_file = "linux/$widevine_arch/widevine_cdm_version.h"
|
| + widevine_cdm_binary_files = [ "linux/$widevine_arch/libwidevinecdm.so" ]
|
| } else if (is_win) {
|
| - widevine_cdm_version_h_file =
|
| - "win/$widevine_arch/widevine_cdm_version.h"
|
| + widevine_cdm_version_h_file = "win/$widevine_arch/widevine_cdm_version.h"
|
| widevine_cdm_binary_files = [
|
| "win/$widevine_arch/widevinecdm.dll",
|
| "win/$widevine_arch/widevinecdm.dll.lib",
|
| ]
|
| } else if (is_mac) {
|
| - widevine_cdm_version_h_file =
|
| - "mac/$widevine_arch/widevine_cdm_version.h"
|
| - widevine_cdm_binary_files = [
|
| - "mac/$widevine_arch/libwidevinecdm.dylib",
|
| - ]
|
| + widevine_cdm_version_h_file = "mac/$widevine_arch/widevine_cdm_version.h"
|
| + widevine_cdm_binary_files = [ "mac/$widevine_arch/libwidevinecdm.dylib" ]
|
| } else {
|
| # Other platforms, use the default one.
|
| widevine_cdm_version_h_file = "widevine_cdm_version.h"
|
| @@ -50,7 +41,10 @@ if (is_android) {
|
|
|
| # GYP version: third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h
|
| copy("version_h") {
|
| - sources = [ widevine_cdm_version_h_file ]
|
| + sources = [
|
| + widevine_cdm_version_h_file,
|
| + ]
|
| +
|
| # TODO(brettw) this should go into target_out_dir and callers should include
|
| # it from there. This requires, however, renaming the default
|
| # widevine_cdm_version.h in this directory to avoid conflicts.
|
| @@ -66,6 +60,7 @@ if (widevine_cdm_binary_files == []) {
|
| copy("binaries") {
|
| sources = widevine_cdm_binary_files
|
| outputs = [ "$root_out_dir/{{source_file_part}}" ]
|
| +
|
| # TODO(GYP)
|
| # 'COPY_PHASE_STRIP': 'NO',
|
| }
|
| @@ -77,12 +72,13 @@ source_set("adapter") {
|
| ":version_h",
|
| ":binaries",
|
| "//ppapi:ppapi_cpp",
|
| +
|
| #'<(DEPTH)/media/media_cdm_adapter.gyp:cdmadapter', TODO(GYP)
|
| ]
|
| }
|
|
|
| if (is_linux) {
|
| - libs = [ rebase_path("$root_out_dir/libwidevinecdm.so", root_build_dir) ]
|
| + libs = [ rebase_path("$root_out_dir/libwidevinecdm.so", root_build_dir) ]
|
| } else if (is_win) {
|
| libs = [ rebase_path("$root_out_dir/widevinecdm.dll.lib", root_build_dir) ]
|
| } else if (is_mac) {
|
|
|