(reland) media: Use platform specific folders for CDMs

chrome/chrome_dll_bundle.gypi

Index: chrome/chrome_dll_bundle.gypi
diff --git a/chrome/chrome_dll_bundle.gypi b/chrome/chrome_dll_bundle.gypi
index 38755ae403cdeaa29d74820e065731571cfb6589..1c0c8450ae5e0a9c56c9b4f895cb34998615574f 100644
--- a/chrome/chrome_dll_bundle.gypi
+++ b/chrome/chrome_dll_bundle.gypi
@@ -40,6 +40,7 @@
   },
   '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
@@ -134,12 +135,12 @@
     {
       # 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',
           ],
         }],
       ],