Revert "Revert "media: Move widevine CDM targets to WidevineCdm folder""

media/media.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': {
     'chromium_code': 1,
     # Override to dynamically link the cras (ChromeOS audio) library.
     'use_cras%': 0,
     # Option e.g. for Linux distributions to link pulseaudio directly
@@ skipping 1088 matching lines @@
             ['include', '^base/mac/corevideo_glue\\.h$'],
             ['include', '^base/mac/videotoolbox_glue\\.h$'],
             ['include', '^base/mac/videotoolbox_glue\\.mm$'],
             ['include', '^base/mac/video_frame_mac\\.h$'],
             ['include', '^base/mac/video_frame_mac\\.cc$'],
           ],
         }],
       ],  # target_conditions
     },
     {
+      # GN version: //media:cdm_paths
+      'target_name': 'cdm_paths',
+      'type': 'static_library',
+      'sources': [
+        'cdm/cdm_paths.cc',
+        'cdm/cdm_paths.h',
+      ],
+      'dependencies': [
+        'shared_memory_support',
+        '../base/base.gyp:base',
+      ]
+    },
+    {
       # GN version: //media:media_unittests
       'target_name': 'media_unittests',
       'type': '<(gtest_target_type)',
       'dependencies': [
         'audio_test_config',
+        'cdm_paths',
         'media',
         'media_features',
         'media_test_support',
         'shared_memory_support',
         '../base/base.gyp:base',
         '../base/base.gyp:base_i18n',
         '../base/base.gyp:test_support_base',
         '../gpu/gpu.gyp:command_buffer_common',
         '../gpu/gpu.gyp:gpu_unittest_utils',
         '../skia/skia.gyp:skia',
@@ skipping 196 matching lines @@
           ],
         }],
         # If ExternalClearKey is built, we can test CdmAdapter.
         ['enable_pepper_cdms == 1', {
           'dependencies': [
             'clearkeycdm',
           ],
           'sources': [
             'cdm/cdm_adapter_unittest.cc',
           ],
+          'conditions': [
+            ['OS == "mac"', {
+              'xcode_settings': {
+                'LD_RUNPATH_SEARCH_PATHS' : [ '@executable_path/<(clearkey_cdm_path)' ],
+              },
+            }]
+           ],
         }],
         ['target_arch != "arm" and chromeos == 1 and use_x11 == 1', {
           'sources': [
             'filters/h264_bitstream_buffer_unittest.cc',
           ],
         }],
         ['target_arch=="ia32" or target_arch=="x64"', {
           'sources': [
             'base/simd/convert_rgb_to_yuv_unittest.cc',
           ],
@@ skipping 950 matching lines @@
                 'dependencies': [
                   '../build/linux/system.gyp:libdrm',
                 ]
               }],
             ],
           }
         ]
     }],
   ],
 }