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

chrome/chrome_installer.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.
 
 {
+  'includes': [
+    '../media/cdm_paths.gypi',
+  ],
   'variables': {
     'lastchange_path': '../build/util/LASTCHANGE',
     'branding_dir': 'app/theme/<(branding_path_component)',
     'branding_dir_100': 'app/theme/default_100_percent/<(branding_path_component)',
   },
   'conditions': [
     ['OS=="win"', {
       'targets': [
         {
           # GN version: //chrome/installer/gcapi
@@ skipping 502 matching lines @@
                     '-d', '<(branding_path_component)'],
         'rpm_cmd': ['<@(flock_bash)', '<(rpm_build)', '-o' '<(PRODUCT_DIR)',
                     '-b', '<(PRODUCT_DIR)', '-a', '<(target_arch)',
                     '-d', '<(branding_path_component)'],
         'conditions': [
           ['target_arch=="ia32"', {
             'deb_arch': 'i386',
             'rpm_arch': 'i386',
             'packaging_files_binaries': [
               '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe',
-              '<(PRODUCT_DIR)/libwidevinecdmadapter.so',
-              '<(PRODUCT_DIR)/libwidevinecdm.so',
+              '<(PRODUCT_DIR)/<(widevine_cdm_path)/libwidevinecdmadapter.so',
+              '<(PRODUCT_DIR)/<(widevine_cdm_path)/libwidevinecdm.so',
             ],
             'packaging_files_common': [
               '<(DEPTH)/build/linux/bin/eu-strip',
             ],
           }],
           ['target_arch=="x64"', {
             'deb_arch': 'amd64',
             'rpm_arch': 'x86_64',
             'packaging_files_binaries': [
               '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe',
-              '<(PRODUCT_DIR)/libwidevinecdmadapter.so',
-              '<(PRODUCT_DIR)/libwidevinecdm.so',
+              '<(PRODUCT_DIR)/<(widevine_cdm_path)/libwidevinecdmadapter.so',
+              '<(PRODUCT_DIR)/<(widevine_cdm_path)/libwidevinecdm.so',
             ],
             'packaging_files_common': [
               '<!(which eu-strip)',
             ],
           }],
           ['target_arch=="arm"', {
             'deb_arch': 'arm',
             'rpm_arch': 'arm',
           }],
           ['asan==1', {
@@ skipping 621 matching lines @@
             '../build/isolate.gypi',
           ],
           'sources': [
             'setup_unittests.isolate',
           ],
         },
       ],
     }],
   ],
 }