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

third_party/widevine/cdm/widevine_cdm.gyp

Index: third_party/widevine/cdm/widevine_cdm.gyp
diff --git a/third_party/widevine/cdm/widevine_cdm.gyp b/third_party/widevine/cdm/widevine_cdm.gyp
index 97a416518bfb4063443695365f665d6870fa5acd..c576396d75cf564d779bf61c0afc7f1c782ee9cd 100644
--- a/third_party/widevine/cdm/widevine_cdm.gyp
+++ b/third_party/widevine/cdm/widevine_cdm.gyp
@@ -60,8 +60,8 @@
   },
   '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': [
@@ -84,8 +84,8 @@
       ],
     },
     {
-      # GN version: //third_party/widevine/cdm:widevinecdmadapter
-      'target_name': 'widevinecdmadapter',
+      'target_name': 'widevinecdmadapter_binary',
+      'product_name': 'widevinecdmadapter',
       'type': 'none',
       'conditions': [
         [ '(branding == "Chrome" or enable_widevine == 1) and enable_pepper_cdms == 1', {
@@ -104,26 +104,51 @@
               'libraries': [
                 '-lrt',
                 # Copied/created by widevinecdm.
-                '<(PRODUCT_DIR)/libwidevinecdm.so',
+                '<(PRODUCT_DIR)/<(widevine_cdm_path)/libwidevinecdm.so',
               ],
             }],
             [ 'OS == "win"', {
               'libraries': [
                 # Copied/created by widevinecdm.
-                '<(PRODUCT_DIR)/widevinecdm.dll.lib',
+                '<(PRODUCT_DIR)/<(widevine_cdm_path)/widevinecdm.dll.lib',
               ],
             }],
             [ 'OS == "mac"', {
               'libraries': [
                 # Copied/created by widevinecdm.
-                '<(PRODUCT_DIR)/libwidevinecdm.dylib',
+                '<(PRODUCT_DIR)/<(widevine_cdm_path)/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',
@@ -146,19 +171,18 @@
             }],
           ],
           'copies': [{
-            # 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)',
+            'destination': '<(PRODUCT_DIR)/<(widevine_cdm_path)',
             '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',
-              # Note that this causes the binary to be put in PRODUCT_DIR
-              # instead of lib/. This matches what happens in the copy step
-              # above.
+              # 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.
             }],
             ['OS == "mac" or OS == "win"', {
               'type': 'shared_library',