1 files changed, 25 insertions, 40 deletions

diff --git a/chromium/third_party/widevine/cdm/widevine_cdm.gyp b/chromium/third_party/widevine/cdm/widevine_cdm.gyp
index 26b10435eb8..48896c153c4 100644
--- a/chromium/third_party/widevine/cdm/widevine_cdm.gyp
+++ b/chromium/third_party/widevine/cdm/widevine_cdm.gyp
@@ -11,36 +11,36 @@
         'conditions': [
           [ 'chromeos == 1', {
             'widevine_cdm_version_h_file%':
-                'symbols/chromeos/<(target_arch)/widevine_cdm_version.h',
+                'chromeos/<(target_arch)/widevine_cdm_version.h',
             'widevine_cdm_binary_files%': [
-              'binaries/chromeos/<(target_arch)/libwidevinecdm.so',
+              'chromeos/<(target_arch)/libwidevinecdm.so',
             ],
           }],
           [ 'OS == "linux" and chromeos == 0', {
             'widevine_cdm_version_h_file%':
-                'symbols/linux/<(target_arch)/widevine_cdm_version.h',
+                'linux/<(target_arch)/widevine_cdm_version.h',
             'widevine_cdm_binary_files%': [
-              'binaries/linux/<(target_arch)/libwidevinecdm.so',
+              'linux/<(target_arch)/libwidevinecdm.so',
             ],
           }],
           [ 'OS == "mac"', {
             'widevine_cdm_version_h_file%':
-                'symbols/mac/<(target_arch)/widevine_cdm_version.h',
+                'mac/<(target_arch)/widevine_cdm_version.h',
             'widevine_cdm_binary_files%': [
-              'binaries/mac/<(target_arch)/libwidevinecdm.dylib',
+              'mac/<(target_arch)/libwidevinecdm.dylib',
             ],
           }],
           [ 'OS == "win"', {
             'widevine_cdm_version_h_file%':
-                'symbols/win/<(target_arch)/widevine_cdm_version.h',
+                'win/<(target_arch)/widevine_cdm_version.h',
             'widevine_cdm_binary_files%': [
-              'binaries/win/<(target_arch)/widevinecdm.dll',
-              'binaries/win/<(target_arch)/widevinecdm.dll.lib',
+              'win/<(target_arch)/widevinecdm.dll',
+              'win/<(target_arch)/widevinecdm.dll.lib',
             ],
           }],
         ],
       }],
-      [ 'OS == "android" and google_tv != 1', {
+      [ 'OS == "android"', {
         'widevine_cdm_version_h_file%':
             'android/widevine_cdm_version.h',
       }],
@@ -50,69 +50,42 @@
   # anything to be done in this file (instead of a higher-level .gyp file).
   'targets': [
     {
+      # GN version: //third_party/widevine/cdm:adapter
       'target_name': 'widevinecdmadapter',
       'type': 'none',
       'conditions': [
         [ 'branding == "Chrome" 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',
           ],
-          'sources': [
-            '<(DEPTH)/media/cdm/ppapi/api/content_decryption_module.h',
-            '<(DEPTH)/media/cdm/ppapi/cdm_adapter.cc',
-            '<(DEPTH)/media/cdm/ppapi/cdm_adapter.h',
-            '<(DEPTH)/media/cdm/ppapi/cdm_helpers.cc',
-            '<(DEPTH)/media/cdm/ppapi/cdm_helpers.h',
-            '<(DEPTH)/media/cdm/ppapi/cdm_logging.cc',
-            '<(DEPTH)/media/cdm/ppapi/cdm_logging.h',
-            '<(DEPTH)/media/cdm/ppapi/cdm_wrapper.h',
-            '<(DEPTH)/media/cdm/ppapi/linked_ptr.h',
-            '<(DEPTH)/media/cdm/ppapi/supported_cdm_versions.h',
-          ],
           'conditions': [
             [ 'os_posix == 1 and OS != "mac"', {
-              'cflags': ['-fvisibility=hidden'],
-              'type': 'loadable_module',
-              # Allow the plugin adapter to find the CDM in the same directory.
-              'ldflags': ['-Wl,-rpath=\$$ORIGIN'],
               'libraries': [
                 # Copied by widevine_cdm_binaries.
                 '<(PRODUCT_DIR)/libwidevinecdm.so',
               ],
             }],
             [ 'OS == "win"', {
-              'type': 'shared_library',
-              # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
-              'msvs_disabled_warnings': [ 4267, ],
               'libraries': [
                 # Copied by widevine_cdm_binaries.
                 '<(PRODUCT_DIR)/widevinecdm.dll.lib',
               ],
             }],
             [ 'OS == "mac"', {
-              'type': 'loadable_module',
-              'product_extension': 'plugin',
               'libraries': [
                 # Copied by widevine_cdm_binaries.
                 '<(PRODUCT_DIR)/libwidevinecdm.dylib',
               ],
-              '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',
-                ],
-                'DYLIB_INSTALL_NAME_BASE': '@loader_path',
-              },
             }],
           ],
         }],
       ],
     },
     {
+      # GN version: //third_party/widevine/cdm:version_h
       'target_name': 'widevine_cdm_version_h',
       'type': 'none',
       'copies': [{
@@ -121,6 +94,7 @@
       }],
     },
     {
+      # GN version: //third_party/widevine/cdm:binaries
       'target_name': 'widevine_cdm_binaries',
       'type': 'none',
       'conditions': [
@@ -137,5 +111,16 @@
         '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',
+          ],
+        }],
+      ],
+    },
   ],
 }