Allow widevinecdmadapter to be built in Chromium

third_party/widevine/cdm/widevine_cdm.gyp

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
+    # Allow widevinecdmadapter to be built in Chromium.
+    'enable_widevine%': 0,

[ddorwin, 2015/04/01 23:27:32]

In common.gypi, this is after the nested block and has the identical variable
name instead of 0:
          'chromeos%': '<(chromeos)',

[jrummell, 2015/04/02 23:47:55]

Done.

+    'variables': {
+      'enable_widevine%': 0,
+    },
     'widevine_cdm_version_h_file%': 'widevine_cdm_version.h',
     'widevine_cdm_binary_files%': [],
     'conditions': [
       [ 'branding == "Chrome"', {
         'conditions': [
           [ 'chromeos == 1', {
             'widevine_cdm_version_h_file%':
                 'chromeos/<(target_arch)/widevine_cdm_version.h',
             'widevine_cdm_binary_files%': [
               'chromeos/<(target_arch)/libwidevinecdm.so',
@@ skipping 20 matching lines @@
               'win/<(target_arch)/widevinecdm.dll',
               'win/<(target_arch)/widevinecdm.dll.lib',
             ],
           }],
         ],
       }],
       [ 'OS == "android"', {
         'widevine_cdm_version_h_file%':
             'android/widevine_cdm_version.h',
       }],
+      [ 'branding != "Chrome" and OS != "android" and enable_widevine==1', {
+        # 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%':
+            'stub/widevine_cdm_version.h',

[ddorwin, 2015/04/01 23:27:32]

Widevine-specific file should not be in common code. Should be in this
directory.

[jrummell, 2015/04/02 23:47:55]

See previous comment in widevine_cdm_version.h.

[ddorwin, 2015/04/03 18:30:56]

Ignore this too. This is relative to widevine/cdm.

+        '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': [
     '../../../build/util/version.gypi',
   ],
 
   # Always provide a target, so we can put the logic about whether there's
   # anything to be done in this file (instead of a higher-level .gyp file).
   'targets': [
     {
@@ skipping 22 matching lines @@
       ],
       'includes': [
         '../../../chrome/version_resource_rules.gypi',
       ],
     },
     {
       # GN version: //third_party/widevine/cdm:adapter
       'target_name': 'widevinecdmadapter',
       'type': 'none',
       'conditions': [
-        [ 'branding == "Chrome" and enable_pepper_cdms==1', {
+        [ '(branding == "Chrome" or enable_widevine==1) and enable_pepper_cdms==1', {
           'dependencies': [
             '<(DEPTH)/ppapi/ppapi.gyp:ppapi_cpp',
             '<(DEPTH)/media/media_cdm_adapter.gyp:cdmadapter',
             'widevine_cdm_version_h',
             'widevine_cdm_binaries',
             'widevinecdmadapter_resources',
           ],
           'sources': [
             '<(SHARED_INTERMEDIATE_DIR)/widevinecdmadapter_version.rc',
           ],
@@ skipping 12 matching lines @@
               ],
             }],
             [ 'OS == "mac"', {
               'libraries': [
                 # Copied by widevine_cdm_binaries.
                 '<(PRODUCT_DIR)/libwidevinecdm.dylib',
               ],
             }],
           ],
         }],
+        [ 'branding != "Chrome" and enable_widevine==1 and enable_pepper_cdms==1', {
+          'dependencies': [
+            '<(DEPTH)/media/media.gyp:stubcdm',

[xhwang, 2015/04/02 18:51:52]

hmm, why not depend on widevine_cdm_binaries?

And do we need the "libraries"?

[jrummell, 2015/04/02 23:47:55]

Removed, since the widevine_cdm_binaries depends on the stub if necessary.

+          ],
+        }],
       ],
     },
     {
       # GN version: //third_party/widevine/cdm:version_h
       'target_name': 'widevine_cdm_version_h',
       'type': 'none',
       'copies': [{
         'destination': '<(SHARED_INTERMEDIATE_DIR)',
         'files': [ '<(widevine_cdm_version_h_file)' ],
       }],
     },
     {
       # GN version: //third_party/widevine/cdm:binaries
       'target_name': 'widevine_cdm_binaries',
       'type': 'none',
       'conditions': [
         [ 'OS=="mac"', {
           'xcode_settings': {
             'COPY_PHASE_STRIP': 'NO',
           }
         }],
+        [ 'branding == "Chrome"', {
+          '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/04/01 23:27:32]

remove the android check here too?

[jrummell, 2015/04/02 23:47:55]

For Android there are no stub files, so this will fail (unless I want to make
the script more intelligent). Original code just did the 'copies' block, which
is a NOP if files == [].

[ddorwin, 2015/04/03 02:06:56]

Oh, do we evaluate these rules even if there is no path to building them (as is
the case on Android)? If so, you're right - you will need that check.

+          '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',
       'type': 'none',
       'conditions': [
         [ 'branding == "Chrome" and OS == "linux"', {
           'dependencies': [
             '<(DEPTH)/third_party/widevine/test/license_server/license_server.gyp:test_license_server',
           ],
         }],
       ],
     },
   ],
 }