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

Unified Diff: chrome/BUILD.gn

Issue 2033923002: [Mac/GN] Include WidevineCdm for Chrome builds. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/BUILD.gn
diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
index 6fb3011e30b37472da5828c3bb5e8ec69028e2e1..08e91000341396e304b1b32192147362277987e5 100644
--- a/chrome/BUILD.gn
+++ b/chrome/BUILD.gn
@@ -25,6 +25,7 @@ if (is_android) {
import("//build/util/branding.gni")
import("//build/util/version.gni")
import("//build_overrides/v8.gni")
+ import("//media/cdm/ppapi/cdm_paths.gni")
}
if (is_win) {
@@ -709,20 +710,53 @@ if (is_win) {
sources = [
"$root_out_dir/PepperFlash/PepperFlashPlayer.plugin",
]
-
outputs = [
"{{bundle_root_dir}}/Internet Plug-Ins/PepperFlash/{{source_file_part}}",
]
-
public_deps = [
"//third_party/adobe/flash:flapper_binaries",
]
}
+
+ bundle_data("widevine_plugin_libs") {
xhwang 2016/06/02 21:04:44 nit: here and below, s/plugin/cdm
Robert Sesek 2016/06/03 15:43:01 I'm going to use "library" instead because that's
xhwang 2016/06/03 16:09:34 Well, library_libs seems redundant. I feel the "li
Robert Sesek 2016/06/03 18:35:15 It isn't redundant. The "libs" covers the fact tha
+ sources = [
+ "$root_out_dir/$widevine_cdm_path/libwidevinecdm.dylib",
+ "$root_out_dir/$widevine_cdm_path/widevinecdmadapter.plugin",
+ ]
+ outputs = [
+ "{{bundle_root_dir}}/Libraries/$widevine_cdm_path/{{source_file_part}}",
+ ]
+ public_deps = [
+ "//third_party/widevine/cdm:widevinecdm",
+ "//third_party/widevine/cdm:widevinecdmadapter",
+ ]
+ }
+
+ bundle_data("widevine_plugin_manifest") {
xhwang 2016/06/02 21:04:44 ditto
+ sources = [
+ "$root_out_dir/WidevineCdm/manifest.json",
+ ]
+ outputs = [
+ "{{bundle_root_dir}}/Libraries/WidevineCdm/{{source_file_part}}",
+ ]
+ public_deps = [
+ "//third_party/widevine/cdm:widevine_cdm_manifest",
+ ]
+ }
} else {
group("flash_player_plugin") {
}
}
+ group("widevine_plugin") {
xhwang 2016/06/02 21:04:44 ditto
+ if (is_chrome_branded) {
+ deps = [
+ ":widevine_plugin_libs",
+ ":widevine_plugin_manifest",
+ ]
+ }
+ }
+
if (enable_mac_keystone) {
action("keystone_registration_framework") {
script = "//chrome/tools/build/mac/copy_keystone_framework.py"
@@ -843,6 +877,7 @@ if (is_win) {
":chrome_framework_plugins",
":chrome_framework_resources",
":flash_player_plugin",
+ ":widevine_plugin",
"//build/config/sanitizers:deps",
"//chrome/app/nibs:chrome_xibs",
]
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698