Revert of media: Use platform specific folders for CDMs

media/media_cdm.gypi

 # Copyright 2013 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.
 
 {
   'includes': [
-    'cdm_paths.gypi',
     'media_variables.gypi',
   ],
   'variables': {
     # Set |use_fake_video_decoder| to 1 to ignore input frames in |clearkeycdm|,
     # and produce video frames filled with a solid color instead.
     'use_fake_video_decoder%': 0,
     # Set |use_libvpx_in_clear_key_cdm| to 1 to use libvpx for VP8 decoding in
     # |clearkeycdm|.
     'use_libvpx_in_clear_key_cdm%': 0,
   },
   'conditions': [
     ['enable_pepper_cdms==1', {
         'includes': [
           '../build/util/version.gypi',
         ],
         'targets': [
         {
           # GN version: //media/cdm/ppapi:clearkeycdm
           'target_name': 'clearkeycdm',
-          'product_dir': '<(PRODUCT_DIR)/<(clearkey_cdm_path)',
           'type': 'none',
           # TODO(tomfinegan): Simplify this by unconditionally including all the
           # decoders, and changing clearkeycdm to select which decoder to use
           # based on environment variables.
           'conditions': [
             ['use_fake_video_decoder == 1' , {
               'defines': ['CLEAR_KEY_CDM_USE_FAKE_VIDEO_DECODER'],
               'sources': [
                 'cdm/ppapi/external_clear_key/fake_cdm_video_decoder.cc',
                 'cdm/ppapi/external_clear_key/fake_cdm_video_decoder.h',
@@ skipping 26 matching lines @@
               ],
             }],
             ['os_posix == 1 and OS != "mac"', {
               'type': 'loadable_module',  # Must be in PRODUCT_DIR for ASAN bot.
             }],
             ['OS == "mac" or OS == "win"', {
               'type': 'shared_library',
             }],
             ['OS == "mac"', {
               'xcode_settings': {
-                'DYLIB_INSTALL_NAME_BASE': '@rpath',
+                'DYLIB_INSTALL_NAME_BASE': '@loader_path',
               },
             }]
           ],
           'defines': ['CDM_IMPLEMENTATION'],
           'dependencies': [
             'media',
             '../url/url.gyp:url_lib',
             # Include the following for media::AudioBus.
             'shared_memory_support',
             '<(DEPTH)/base/base.gyp:base',
@@ skipping 23 matching lines @@
             'extra_variable_files': [ 'cdm/ppapi/external_clear_key/BRANDING' ],
           },
           'sources': [
             'clearkeycdmadapter.ver',
           ],
           'includes': [
             '../chrome/version_resource_rules.gypi',
           ],
         },
         {
-          'target_name': 'clearkeycdmadapter_binary',
-          'product_name': 'clearkeycdmadapter',
+          # GN version: //media/cdm/ppapi:clearkeycdmadapter
+          'target_name': 'clearkeycdmadapter',
           'type': 'none',
           # Check whether the plugin's origin URL is valid.
           'defines': ['CHECK_DOCUMENT_URL'],
           'dependencies': [
             '<(DEPTH)/ppapi/ppapi.gyp:ppapi_cpp',
             'media_cdm_adapter.gyp:cdmadapter',
             'clearkeycdm',
             'clearkeycdmadapter_resources',
           ],
           'sources': [
             '<(SHARED_INTERMEDIATE_DIR)/clearkeycdmadapter_version.rc',
           ],
           'conditions': [
             ['os_posix == 1 and OS != "mac"', {
               # Because clearkeycdm has type 'loadable_module' (see comments),
               # we must explicitly specify this dependency.
               'libraries': [
                '-lrt',
                 # Built by clearkeycdm.
-                '<(PRODUCT_DIR)/<(clearkey_cdm_path)/libclearkeycdm.so',
+                '<(PRODUCT_DIR)/libclearkeycdm.so',
               ],
             }],
-            ['OS == "mac"', {
-              'xcode_settings': {
-                'LD_RUNPATH_SEARCH_PATHS' : [ '@loader_path/.' ],
-              },
-            }, {
-              # Put Clear Key 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 "clearkeycdmadapter" target to copy it over.
-              # See http://crbug.com/611990
-              'product_dir': '<(PRODUCT_DIR)/<(clearkey_cdm_path)',
-            }]
           ],
         },
-        {
-          # GN version: //media/cdm/ppapi:clearkeycdmadapter
-          # On Mac this copies the clearkeycdmadapter binary to
-          # <(clearkey_cdm_path). On all other platforms the binary is already
-          # in <(clearkey_cdm_path). See "product_dir" above.
-          'target_name': 'clearkeycdmadapter',
-          'type': 'none',
-          'dependencies': [
-            'clearkeycdmadapter_binary',
-          ],
-          'conditions': [
-            ['OS == "mac"', {
-              'copies': [{
-                'destination': '<(PRODUCT_DIR)/<(clearkey_cdm_path)',
-                'files': [ '<(PRODUCT_DIR)/clearkeycdmadapter.plugin' ],
-              }],
-            }],
-          ],
-        }],
+      ],
     }],
   ],
 }