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

media/media_cdm.gypi

Index: media/media_cdm.gypi
diff --git a/media/media_cdm.gypi b/media/media_cdm.gypi
index 5efcb3bd91c20094aca79b99d27c881121af696f..18b115c1e1a378dcf5aba6b8d4c78c58a79f14bb 100644
--- a/media/media_cdm.gypi
+++ b/media/media_cdm.gypi
@@ -4,6 +4,7 @@
 
 {
   'includes': [
+    'cdm_paths.gypi',
     'media_variables.gypi',
   ],
   'variables': {
@@ -23,6 +24,7 @@
         {
           # 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
@@ -69,7 +71,7 @@
             }],
             ['OS == "mac"', {
               'xcode_settings': {
-                'DYLIB_INSTALL_NAME_BASE': '@loader_path',
+                'DYLIB_INSTALL_NAME_BASE': '@rpath',
               },
             }]
           ],
@@ -113,8 +115,8 @@
           ],
         },
         {
-          # GN version: //media/cdm/ppapi:clearkeycdmadapter
-          'target_name': 'clearkeycdmadapter',
+          'target_name': 'clearkeycdmadapter_binary',
+          'product_name': 'clearkeycdmadapter',
           'type': 'none',
           # Check whether the plugin's origin URL is valid.
           'defines': ['CHECK_DOCUMENT_URL'],
@@ -134,12 +136,41 @@
               'libraries': [
                '-lrt',
                 # Built by clearkeycdm.
-                '<(PRODUCT_DIR)/libclearkeycdm.so',
+                '<(PRODUCT_DIR)/<(clearkey_cdm_path)/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' ],
+              }],
+            }],
+          ],
+        }],
     }],
   ],
 }