(reland) media: Use platform specific folders for CDMs

chrome/common_constants.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,
     'common_constants_sources': [
       'common/chrome_constants.cc',
       'common/chrome_constants.h',
@@ skipping 69 matching lines @@
       ],
       'include_dirs': [
         '<(SHARED_INTERMEDIATE_DIR)',  # Needed by chrome_paths.cc.
       ],
       'dependencies': [
         'version_header',
         'chrome_features.gyp:chrome_common_features',
         '../base/base.gyp:base',
         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '../components/components.gyp:bookmarks_common',
+        '../media/media.gyp:cdm_paths',  # Needed by chrome_paths.cc.
         '../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h',
       ],
       'target_conditions': [
         ['OS=="ios"', {
           # iOS needs chrome_paths_mac, which is excluded by filename rules;
           # re-add it in target_conditionals so it's after that exclusion.
           'sources/': [
             ['include', '^common/chrome_paths_mac\\.mm$'],
           ],
         }],
@@ skipping 35 matching lines @@
           'configurations': {
             'Common_Base': {
               'msvs_target_platform': 'x64',
             },
           },
         },
       ],
     }],
   ],
 }