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

Unified Diff: win_toolchain/get_toolchain_if_necessary.py

Issue 1680433002: Skip installation of UCRT (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/depot_tools.git@master
Patch Set: Created 4 years, 10 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: win_toolchain/get_toolchain_if_necessary.py
diff --git a/win_toolchain/get_toolchain_if_necessary.py b/win_toolchain/get_toolchain_if_necessary.py
index 33e057b62bf9ea455ef2a3f2948b7694db147494..0ac500b16e85a67f877096131bcc6e1e515e353f 100755
--- a/win_toolchain/get_toolchain_if_necessary.py
+++ b/win_toolchain/get_toolchain_if_necessary.py
@@ -354,36 +354,7 @@ def GetInstallerName():
def InstallUniversalCRTIfNeeded(abs_target_dir):
- installer_name = GetInstallerName()
- if not installer_name:
- return
-
- bitness = platform.architecture()[0]
- # When running 64-bit python the x64 DLLs will be in System32
- x64_path = 'System32' if bitness == '64bit' else 'Sysnative'
- x64_path = os.path.join(r'C:\Windows', x64_path)
- sample_crt_file = os.path.join(x64_path, 'ucrtbase.dll')
-
- if os.path.exists(sample_crt_file):
- # Nothing to do.
- return
-
- print ('%s does not exist - installing Windows 10 Universal C Runtime' %
- sample_crt_file)
-
- installer = os.path.join(abs_target_dir, "installers", installer_name)
- command = r'wusa.exe /quiet "%s"' % installer
- print 'Running %s' % command
-
- try:
- subprocess.check_call(command)
- # Trap OSError instead of WindowsError so pylint will succeed on Linux.
- except OSError as e:
- if e.winerror == 740: # The requested operation requires elevation
- print 'Elevation required. You can manually install this update:'
- print ' %s' % installer
- return
- raise e
+ return
def main():
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698