Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1506)

Unified Diff: third_party/widevine/cdm/BUILD.gn

Issue 2000513002: media: Bundle Widevine CDM on Win/Mac. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: add comments Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/widevine/cdm/BUILD.gn
diff --git a/third_party/widevine/cdm/BUILD.gn b/third_party/widevine/cdm/BUILD.gn
index 5d98b3653dfa6fa65a3b14855d0bf93778dc9d2b..f77c369bf54a88f9bb9ad18b0b0f3211cee9872f 100644
--- a/third_party/widevine/cdm/BUILD.gn
+++ b/third_party/widevine/cdm/BUILD.gn
@@ -14,10 +14,12 @@ if (widevine_arch == "x86") {
widevine_arch = "ia32"
}
+widevine_cdm_binary_files = []
+widevine_cdm_manifest_file = []
+
if (is_android) {
# Always available on Android regardless of branding.
widevine_cdm_version_h_file = "android/widevine_cdm_version.h"
- widevine_cdm_binary_files = []
} else if (is_chrome_branded) {
if (is_chromeos) {
widevine_cdm_version_h_file =
@@ -32,21 +34,20 @@ if (is_android) {
"win/$widevine_arch/widevinecdm.dll",
"win/$widevine_arch/widevinecdm.dll.lib",
]
+ widevine_cdm_manifest_file = [ "win/$widevine_arch/manifest.json" ]
} 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_manifest_file = [ "mac/$widevine_arch/manifest.json" ]
} else {
# Other platforms, use the default one.
widevine_cdm_version_h_file = "widevine_cdm_version.h"
- widevine_cdm_binary_files = []
}
} else if (enable_widevine) {
widevine_cdm_version_h_file = "stub/widevine_cdm_version.h"
- widevine_cdm_binary_files = []
} else {
# No branding, use the default one.
widevine_cdm_version_h_file = "widevine_cdm_version.h"
- widevine_cdm_binary_files = []
}
# GYP version: third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h
@@ -112,6 +113,19 @@ if (widevine_cdm_binary_files != []) {
}
}
+if (widevine_cdm_manifest_file != []) {
+ copy("widevine_cdm_manifest") {
+ sources = widevine_cdm_manifest_file
+ outputs = [
+ "$root_out_dir/WidevineCdm/{{source_file_part}}",
+ ]
+ }
+} else {
+ group("widevine_cdm_manifest") {
+ # NOP
+ }
+}
+
if ((is_chrome_branded || enable_widevine) && enable_pepper_cdms) {
# Produce and compile the .rc file.
process_version("widevinecdmadapter_resources") {
@@ -129,6 +143,7 @@ if ((is_chrome_branded || enable_widevine) && enable_pepper_cdms) {
output_dir = "$root_out_dir/$widevine_cdm_path"
deps = [
":version_h",
+ ":widevine_cdm_manifest",
":widevinecdm",
":widevinecdmadapter_resources",
]

Powered by Google App Engine
This is Rietveld 408576698