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

chrome/tools/build/win/create_installer_archive.py

Index: chrome/tools/build/win/create_installer_archive.py
diff --git a/chrome/tools/build/win/create_installer_archive.py b/chrome/tools/build/win/create_installer_archive.py
index f658ec497ba1e3687e975c67d912a303606f6c46..ad1f56c5d5f9cf8789c9d02bb76ac2c76ab092fe 100755
--- a/chrome/tools/build/win/create_installer_archive.py
+++ b/chrome/tools/build/win/create_installer_archive.py
@@ -173,7 +173,7 @@ def MakeStagingDirectories(staging_dir):
   os.makedirs(temp_file_path)
   return (file_path, temp_file_path)
 
-def Readconfig(input_file, current_version):
+def Readconfig(input_file, current_version, target_arch):
   """Reads config information from input file after setting default value of
   global variabes.
   """
@@ -181,6 +181,7 @@ def Readconfig(input_file, current_version):
   variables['ChromeDir'] = CHROME_DIR
   variables['VersionDir'] = os.path.join(variables['ChromeDir'],
                                           current_version)
+  variables['ComponentDir'] = '_platform_specific\win_' + target_arch
   config = ConfigParser.SafeConfigParser(variables)
   config.read(input_file)
   return config
@@ -612,7 +613,7 @@ def main(options):
   """
   current_version = BuildVersion(options.build_dir)
 
-  config = Readconfig(options.input_file, current_version)
+  config = Readconfig(options.input_file, current_version, options.target_arch)
 
   (staging_dir, temp_dir) = MakeStagingDirectories(options.staging_dir)