Revert of media: Use platform specific folders for CDMs

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.
     'variables': {
       'enable_widevine%': 0,
     },
@@ skipping 42 matching lines @@
         # If enable_widevine==1 then create a dummy widevinecdm. On Win/Mac
         # the component updater will get the latest version and use it.
         # Other systems are not currently supported.
         'widevine_cdm_version_h_file%':
             'stub/widevine_cdm_version.h',
       }],
     ],
   },
   'includes': [
     '../../../build/util/version.gypi',
-    '../../../media/cdm_paths.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': [
     {
       # GN version: //third_party/widevine/cdm:widevinecdmadapter_resources
       'target_name': 'widevinecdmadapter_resources',
       'type': 'none',
       'variables': {
         'output_dir': '.',
         'branding_path': '../../../chrome/app/theme/<(branding_path_component)/BRANDING',
         'template_input_path': '../../../chrome/app/chrome_version.rc.version',
         'extra_variable_files_arguments': [ '-f', 'BRANDING' ],
         'extra_variable_files': [ 'BRANDING' ], # NOTE: matches that above
       },
       'sources': [
         'widevinecdmadapter.ver',
       ],
       'includes': [
         '../../../chrome/version_resource_rules.gypi',
       ],
     },
     {
-      'target_name': 'widevinecdmadapter_binary',
-      'product_name': 'widevinecdmadapter',
+      # GN version: //third_party/widevine/cdm:widevinecdmadapter
+      'target_name': 'widevinecdmadapter',
       'type': 'none',
       'conditions': [
         [ '(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',
             'widevinecdm',
             'widevinecdmadapter_resources',
           ],
           'sources': [
             '<(SHARED_INTERMEDIATE_DIR)/widevinecdmadapter_version.rc',
           ],
           'conditions': [
             [ 'os_posix == 1 and OS != "mac"', {
               'libraries': [
                 '-lrt',
                 # Copied/created by widevinecdm.
-                '<(PRODUCT_DIR)/<(widevine_cdm_path)/libwidevinecdm.so',
+                '<(PRODUCT_DIR)/libwidevinecdm.so',
               ],
             }],
             [ 'OS == "win"', {
               'libraries': [
                 # Copied/created by widevinecdm.
-                '<(PRODUCT_DIR)/<(widevine_cdm_path)/widevinecdm.dll.lib',
+                '<(PRODUCT_DIR)/widevinecdm.dll.lib',
               ],
             }],
             [ 'OS == "mac"', {
               'libraries': [
                 # Copied/created by widevinecdm.
-                '<(PRODUCT_DIR)/<(widevine_cdm_path)/libwidevinecdm.dylib',
+                '<(PRODUCT_DIR)/libwidevinecdm.dylib',
               ],
-            }, {
-              # Put Widevine CDM adapter to the correct path directly except
-              # for mac. On mac strip_save_dsym doesn't work with product_dir
-              # so we rely on "widevinecdmadapter" target to copy it over.
-              # See http://crbug.com/611990
-              'product_dir': '<(PRODUCT_DIR)/<(widevine_cdm_path)',
             }],
           ],
         }],
       ],
     },
-    {
-      # GN version: //third_party/widevine/cdm:widevinecdmadapter
-      # On Mac this copies the widevinecdmadapter binary to
-      # <(widevine_cdm_path). On all other platforms the binary is already
-      # in <(widevine_cdm_path). See "product_dir" above.
-      'target_name': 'widevinecdmadapter',
-      'type': 'none',
-      'dependencies': [
-        'widevinecdmadapter_binary',
-      ],
-      'conditions': [
-        [ '(branding == "Chrome" or enable_widevine == 1) and enable_pepper_cdms == 1 and OS == "mac"', {
-          'copies': [{
-            'destination': '<(PRODUCT_DIR)/<(widevine_cdm_path)',
-            'files': [ '<(PRODUCT_DIR)/widevinecdmadapter.plugin' ],
-          }],
-        }],
-      ],
-    },
     {
       # 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:widevinecdm
       'target_name': 'widevinecdm',
       'type': 'none',
       'conditions': [
         [ 'branding == "Chrome"', {
           'conditions': [
             [ 'OS=="mac"', {
               'xcode_settings': {
                 'COPY_PHASE_STRIP': 'NO',
               }
             }],
           ],
           'copies': [{
-            'destination': '<(PRODUCT_DIR)/<(widevine_cdm_path)',
+            # 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 enable_widevine == 1', {
-          'product_dir': '<(PRODUCT_DIR)/<(widevine_cdm_path)',
           'conditions': [
             ['os_posix == 1 and OS != "mac"', {
               'type': 'loadable_module',
-              # This causes the binary to be put in
-              # <(PRODUCT_DIR)/<(widevine_cdm_path) instead of lib/.
-              # This matches what happens in the copy step above.
+              # Note that this causes the binary to be put in PRODUCT_DIR
+              # instead of lib/. This matches what happens in the copy step
+              # above.
             }],
             ['OS == "mac" or OS == "win"', {
               'type': 'shared_library',
             }],
             ['OS == "mac"', {
               'xcode_settings': {
                 'DYLIB_INSTALL_NAME_BASE': '@loader_path',
               },
             }],
           ],
@@ skipping 16 matching lines @@
       'conditions': [
         [ 'branding == "Chrome" and OS == "linux"', {
           'dependencies': [
             '<(DEPTH)/third_party/widevine/test/license_server/license_server.gyp:test_license_server',
           ],
         }],
       ],
     },
   ],
 }