Update CDM interface and add clear key CDM.

webkit/media/webkit_media.gypi

 # 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.
 
 {
   'targets': [
     {
       'target_name': 'webkit_media',
       'type': 'static_library',
       'variables': { 'enable_wexit_time_destructors': 1, },
@@ skipping 66 matching lines @@
             '<(DEPTH)/media/media.gyp:player_android',
           ],
         }, { # OS != "android"'
           'sources/': [
             ['exclude', '^android/'],
           ],
         }],
       ],
     },
     {
-      'target_name': 'ppapi_cdm_wrapper',
+      'target_name': 'clearkeycdm',
+      'type': 'shared_library',
+      'defines': ['CDM_IMPLEMENTATION'],
+      'dependencies': [
+        '<(DEPTH)/base/base.gyp:base',
+        '<(DEPTH)/media/media.gyp:media'
+      ],
+      'sources': [
+        'crypto/ppapi/clear_key_cdm.cc',
+        'crypto/ppapi/clear_key_cdm.h',
+      ],
+    },
+    {
+      'target_name': 'clearkeycdmplugin',
       'type': 'none',
       'dependencies': [
-        '<(DEPTH)/ppapi/ppapi.gyp:ppapi_cpp'
+        '<(DEPTH)/ppapi/ppapi.gyp:ppapi_cpp',
+        'clearkeycdm',
+      ],
+      'sources': [
+        'crypto/ppapi/cdm_wrapper.cc',
       ],
       'conditions': [
         ['os_posix==1 and OS!="mac"', {
           'cflags': ['-fvisibility=hidden'],
           'type': 'shared_library',
           # -gstabs, used in the official builds, causes an ICE. Simply remove
           # it.
           'cflags!': ['-gstabs'],
         }],
         ['OS=="win"', {
           'type': 'shared_library',
         }],
         ['OS=="mac"', {
           'type': 'loadable_module',
           'mac_bundle': 1,
           'product_extension': 'plugin',
           'xcode_settings': {
             'OTHER_LDFLAGS': [
               # Not to strip important symbols by -Wl,-dead_strip.
               '-Wl,-exported_symbol,_PPP_GetInterface',
               '-Wl,-exported_symbol,_PPP_InitializeModule',
               '-Wl,-exported_symbol,_PPP_ShutdownModule'
             ]},
         }],
       ],
-      'sources': [
-        'crypto/ppapi/cdm_wrapper.cc',
-      ],
     }
   ],
 }