Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1187)

Unified Diff: chrome/tools/build/win/create_installer_archive.py

Issue 1989893004: media: Use platform specific folders for CDMs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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
ddorwin 2016/05/19 00:04:26 It's a relative path.
xhwang 2016/05/20 00:22:35 I am still testing this part. Will update this par
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)

Powered by Google App Engine
This is Rietveld 408576698