Allow widevinecdmadapter to be built in Chromium

third_party/widevine/cdm/widevine_cdm.gyp

Index: third_party/widevine/cdm/widevine_cdm.gyp
diff --git a/third_party/widevine/cdm/widevine_cdm.gyp b/third_party/widevine/cdm/widevine_cdm.gyp
index eacbdb3a7414ae817f80fa49c35b5e6160107517..2be4073b3d202dbb5df0ec45be0a731f183d7ee0 100644
--- a/third_party/widevine/cdm/widevine_cdm.gyp
+++ b/third_party/widevine/cdm/widevine_cdm.gyp
@@ -44,6 +44,41 @@
         'widevine_cdm_version_h_file%':
             'android/widevine_cdm_version.h',
       }],
+      [ 'branding != "Chrome" and OS != "android" and enable_widevine==1', {

[ddorwin, 2015/03/28 04:00:11]

It would be nice if we could  keep the paths more similar. For example, ideally
we could share the block above somehow then override certain values.

One idea would be to set the stub name in the block above (even if it's not
used) then have the copy step copy the files to the normal output directory
(lib/ ?)with the new (widevine) names. Then we'd just run the copies step
normally. You'd still need to specify that the widevine_cdm_binary_files are in
lib/ instead of third_party, so you would still need this block.

I guess the only benefit would be that you'd run lines 212-219 in both cases
(while introducing an extra copy).

+        # If enable_widevine==1 then use stub_cdm to create the adapter for
+        # Widevine. On Win/Mac the component updater will get the latest version
+        # and use it. Other systems are not currently supported, but will build.
+        'widevine_cdm_version_h_file%':
+            '../../../media/cdm/ppapi/stub/widevine_cdm_version.h',

[ddorwin, 2015/03/28 04:00:11]

this should be in third_party like the Android file.

[jrummell, 2015/04/01 23:37:37]

Done.

+        'conditions': [
+          [ 'os_posix == 1 and OS != "mac"', {
+            'stub_cdm_binary_files%': [
+              '<(PRODUCT_DIR)/libstubcdm.so',
+            ],
+            'widevine_cdm_binary_files%': [
+              '<(PRODUCT_DIR)/libwidevinecdm.so',
+            ],
+          }],
+          [ 'OS == "mac"', {
+            'stub_cdm_binary_files%': [
+              '<(PRODUCT_DIR)/libstubcdm.dylib',
+            ],
+            'widevine_cdm_binary_files%': [
+              '<(PRODUCT_DIR)/libwidevinecdm.dylib',
+            ],
+          }],
+          [ 'OS == "win"', {
+            'stub_cdm_binary_files%': [
+              '<(PRODUCT_DIR)/stubcdm.dll',
+              '<(PRODUCT_DIR)/stubcdm.dll.lib',
+            ],
+            'widevine_cdm_binary_files%': [
+              '<(PRODUCT_DIR)/widevinecdm.dll',
+              '<(PRODUCT_DIR)/widevinecdm.dll.lib',
+            ],
+          }],
+        ],
+      }],
     ],
   },
   'includes': [
@@ -119,6 +154,40 @@
             }],
           ],
         }],
+        [ 'branding != "Chrome" and enable_pepper_cdms==1 and enable_widevine==1', {
+          'dependencies': [
+            '<(DEPTH)/ppapi/ppapi.gyp:ppapi_cpp',
+            '<(DEPTH)/media/media_cdm_adapter.gyp:cdmadapter',
+            '<(DEPTH)/media/media.gyp:stubcdm',

[ddorwin, 2015/03/28 04:00:11]

It appears that all except this line are common. Can we share the block above
and only add this?

[jrummell, 2015/04/01 23:37:37]

Done.

+            'widevine_cdm_version_h',
+            'widevine_cdm_binaries',
+            'widevinecdmadapter_resources',
+          ],
+          'sources': [
+            '<(SHARED_INTERMEDIATE_DIR)/widevinecdmadapter_version.rc',
+          ],
+          'conditions': [
+            [ 'os_posix == 1 and OS != "mac"', {
+              'libraries': [
+                '-lrt',
+                # Copied by widevine_cdm_binaries.
+                '<(PRODUCT_DIR)/libwidevinecdm.so',
+              ],
+            }],
+            [ 'OS == "win"', {
+              'libraries': [
+                # Copied by widevine_cdm_binaries.
+                '<(PRODUCT_DIR)/widevinecdm.dll.lib',
+              ],
+            }],
+            [ 'OS == "mac"', {
+              'libraries': [
+                # Copied by widevine_cdm_binaries.
+                '<(PRODUCT_DIR)/libwidevinecdm.dylib',
+              ],
+            }],
+          ],
+        }],
       ],
     },
     {
@@ -140,13 +209,33 @@
             'COPY_PHASE_STRIP': 'NO',
           }
         }],
+        [ 'branding == "Chrome" or OS == "android"', {

[ddorwin, 2015/03/28 04:00:11]

Android doesn't copy anything. Android never runs this rule anyway. See line 124
and 129.

[jrummell, 2015/04/01 23:37:37]

Done. (I think Android does run this, just that widevine_cdm_binary_files is []
so the copy is a NOP.)

+          'copies': [{
+            # TODO(ddorwin): Do we need a sub-directory? We either need a
+            # sub-directory or to rename manifest.json before we can copy it.
+            'destination': '<(PRODUCT_DIR)',
+            'files': [ '<@(widevine_cdm_binary_files)' ],
+          }],
+        }],
+        [ 'branding != "Chrome" and OS != "android" and enable_widevine==1', {

[ddorwin, 2015/03/28 04:00:11]

ditto

[jrummell, 2015/04/01 23:37:37]

(Assume this is about Android.) For Android I don't want to run this, since
stub_cdm_binary_files will be undefined (and widevine_cdm_binary_files is []).

+          'dependencies': [
+            '<(DEPTH)/media/media.gyp:stubcdm',
+          ],
+          'actions': [{
+            'action_name': 'copy_with_rename',
+            'inputs': [
+              'copy_with_rename.py',
+              '<@(stub_cdm_binary_files)',
+            ],
+            'outputs': [
+              '<@(widevine_cdm_binary_files)',
+            ],
+            'action': ['python', 'copy_with_rename.py',
+                       '<@(stub_cdm_binary_files)',
+                       '<@(widevine_cdm_binary_files)'],
+          }],
+        }],
       ],
-      'copies': [{
-        # TODO(ddorwin): Do we need a sub-directory? We either need a
-        # sub-directory or to rename manifest.json before we can copy it.
-        'destination': '<(PRODUCT_DIR)',
-        'files': [ '<@(widevine_cdm_binary_files)' ],
-      }],
     },
     {
       'target_name': 'widevine_test_license_server',