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

chrome/chrome_dll_bundle.gypi

 # 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.
 
 # This file contains resources for the main Mac chromium bundle.
 {
   # The main browser executable's name is <(mac_product_name).
   # Certain things will get confused if two modules in the
   # executable share the same name, so append " Framework" to the
   # product_name used for the framework.  This will result in
@@ skipping 22 matching lines @@
         '@executable_path/../Versions/<(version_full)',
     # See /build/mac/copy_framework_unversioned.sh for
     # information on LD_DYLIB_INSTALL_NAME.
     'LD_DYLIB_INSTALL_NAME':
         '$(DYLIB_INSTALL_NAME_BASE:standardizepath)/$(WRAPPER_NAME)/$(PRODUCT_NAME)',
 
     'INFOPLIST_FILE': 'app/framework-Info.plist',
   },
   'includes': [
     'chrome_nibs.gypi',
+    '../media/cdm_paths.gypi',
   ],
   # TODO(mark): Come up with a fancier way to do this.  It should
   # only be necessary to list framework-Info.plist once, not the
   # three times it is listed here.
   'mac_bundle_resources': [
     # This image is used to badge the lock icon in the
     # authentication dialogs, such as those used for installation
     # from disk image and Keystone promotion (if so enabled).  It
     # needs to exist as a file on disk and not just something in a
     # resource bundle because that's the interface that
@@ skipping 74 matching lines @@
         ['branding == "Chrome"', {
           'files': [
             '<(PRODUCT_DIR)/PepperFlash/PepperFlashPlayer.plugin',
           ],
         }],
       ],
     },
     {
       # The adapter is not a complete library on its own. It needs the Widevine
       # CDM to work.
-      'destination': '<(PRODUCT_DIR)/$(CONTENTS_FOLDER_PATH)/Libraries/',
+      'destination': '<(PRODUCT_DIR)/$(CONTENTS_FOLDER_PATH)/Libraries/<(widevine_cdm_path)',
       'files': [],
       'conditions': [
         ['branding == "Chrome"', {
           'files': [
-            '<(PRODUCT_DIR)/widevinecdmadapter.plugin',
+            '<(PRODUCT_DIR)/<(widevine_cdm_path)/widevinecdmadapter.plugin',
           ],
         }],
       ],
     },
     {
       # Copy of resources used by tests.
       'destination': '<(PRODUCT_DIR)/pseudo_locales',
       'files': [
           '<(SHARED_INTERMEDIATE_DIR)/<(pseudo_locales).pak'
       ],
@@ skipping 95 matching lines @@
       ],
     }],
     ['v8_use_external_startup_data==1', {
       'mac_bundle_resources': [
         '<(PRODUCT_DIR)/natives_blob.bin',
         '<(PRODUCT_DIR)/snapshot_blob.bin',
       ],
     }],
   ],  # conditions
 }