Skip to content

Commit 2e22029

Browse files
committed
<chromium> Fix autogenerated env.bat files for Windows builds.
Removes the addition of 'component=share_library' from GYP_DEFINES. This caused a build error due to missing files. Change-Id: I062e7f8ba7d28f298df4bee289e24b495875dc5f Reviewed-by: Frederik Gladhorn <[email protected]>
1 parent 395777d commit 2e22029

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

chromium/tools/win/toolchain/toolchain.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -630,9 +630,8 @@ def GenerateTopLevelEnv(target_dir, vsversion):
630630
file.write('@echo off\n')
631631
file.write(':: Generated by tools\\win\\toolchain\\toolchain.py.\n')
632632
file.write(':: Targeting VS%s.\n' % vsversion)
633-
file.write('set GYP_DEFINES=windows_sdk_path="%s" '
634-
'component=shared_library\n' % (
635-
os.path.join(target_dir, 'win8sdk')))
633+
file.write('set GYP_DEFINES=windows_sdk_path="%s"\n' % (
634+
os.path.join(target_dir, 'win8sdk')))
636635
file.write('set GYP_MSVS_VERSION=%se\n' % vsversion)
637636
file.write('set GYP_MSVS_OVERRIDE_PATH=%s\n' % target_dir)
638637
file.write('set GYP_GENERATORS=ninja\n')

chromium/tools/win/toolchain/toolchain2013.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,8 +160,7 @@ def GenerateTopLevelEnv(target_dir, pro):
160160
with open(os.path.join(target_dir, r'env.bat'), 'w') as file:
161161
file.write('@echo off\n')
162162
file.write(':: Generated by tools\\win\\toolchain\\toolchain2013.py.\n')
163-
file.write('set GYP_DEFINES=windows_sdk_path="%~dp0win8sdk" '
164-
'component=shared_library\n')
163+
file.write('set GYP_DEFINES=windows_sdk_path="%~dp0win8sdk"\n')
165164
file.write('set GYP_MSVS_VERSION=2013%s\n' % '' if pro else 'e')
166165
file.write('set GYP_MSVS_OVERRIDE_PATH=%~dp0\n')
167166
file.write('set GYP_GENERATORS=ninja\n')

0 commit comments

Comments
 (0)