Bundle fake Widevine component manifest for stub CDM

chrome/BUILD.gn

Index: chrome/BUILD.gn
diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
index 1c26c3f29012af6f22a4709c98c11ea97376a6b7..1efd38400ddac654410cfcf7aaa3164017637ad9 100644
--- a/chrome/BUILD.gn
+++ b/chrome/BUILD.gn
@@ -14,6 +14,7 @@ import("//build/config/win/manifest.gni")
 import("//chrome/chrome_repack_locales.gni")
 import("//chrome/common/features.gni")
 import("//chrome/version.gni")
+import("//third_party/widevine/cdm/widevine.gni")
 import("//ui/base/ui_features.gni")
 
 if (is_android) {
@@ -795,21 +796,45 @@ if (is_win) {
         "//third_party/adobe/flash:flapper_binaries",
       ]
     }
+  } else {
+    group("flash_player_plugin") {
+    }
+  }
 
+  if (enable_widevine) {

[ddorwin, 2016/07/18 18:35:17]

enable_widevine does not appear to be set for Chrome builds. (This is something
we need to clean up once the switch to GN is complete.)

I think this should be:
  if ((is_chrome_branded || enable_widevine) && enable_pepper_cdms) 
as in
https://cs.chromium.org/chromium/src/third_party/widevine/cdm/BUILD.gn?q=enab...

enable_pepper_cdms seems to be implied in this file, but it might not hurt to be
explicit.

[wdzierzanowski, 2016/07/19 11:35:17]

Done.

+    # The Widevine CDM and manifest are either the actual Widevine CDM and
+    # manifest or stubs used for testing only. The choice is made within the
+    # corresponding Widevine targets based on branding.
     bundle_data("widevine_cdm_library_binaries") {
       sources = [
-        "$root_out_dir/$widevine_cdm_path/libwidevinecdm.dylib",
+        "$root_out_dir/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",
+        # Need this intermediate dependency because "widevinecdm" is a

[ddorwin, 2016/07/18 18:35:17]

Does this only apply to !is_chrome_branded?

It appears we shouldn't be doing this for !is_chrome_branded, which would make
line 804 correct, but then where does the correct thing happen for
is_chrome_branded?

[wdzierzanowski, 2016/07/19 11:35:17]

The intermediate dependency is not required for !is_chrome_branded, but it
doesn't hurt, either. The gn file is easier to manage if there is one dependency
chain for both cases, I think.

You are right that line 804 needs fixing -- I forgot that is_chrome_branded
doesn't imply enable_widevine.

+        # shared_library if !is_chrome_branded, and then depending on
+        # "widevinecdm" directly would cause it to be linked into the Chromium
+        # Framework, which we don't want.
+        ":widevine_cdm_library_copy",
         "//third_party/widevine/cdm:widevinecdmadapter",
       ]
     }
 
+    copy("widevine_cdm_library_copy") {
+      sources = [
+        "$root_out_dir/$widevine_cdm_path/libwidevinecdm.dylib",
+      ]
+      outputs = [
+        "$root_out_dir/{{source_file_part}}",
+      ]
+      deps = [
+        "//third_party/widevine/cdm:widevinecdm",
+      ]
+    }
+
     bundle_data("widevine_cdm_library_manifest") {
       sources = [
         "$root_out_dir/WidevineCdm/manifest.json",
@@ -821,13 +846,10 @@ if (is_win) {
         "//third_party/widevine/cdm:widevine_cdm_manifest",
       ]
     }
-  } else {
-    group("flash_player_plugin") {
-    }
   }
 
   group("widevine_cdm_library") {
-    if (is_chrome_branded) {
+    if (enable_widevine) {
       deps = [
         ":widevine_cdm_library_binaries",
         ":widevine_cdm_library_manifest",