From 2e220291159804f8d233417178496184a621c46a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Br=C3=BCning?= Date: Thu, 17 Jul 2014 15:48:37 +0200 Subject: 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 --- chromium/tools/win/toolchain/toolchain.py | 5 ++--- chromium/tools/win/toolchain/toolchain2013.py | 3 +-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/chromium/tools/win/toolchain/toolchain.py b/chromium/tools/win/toolchain/toolchain.py index 1c16fb1632b..fdbb0c21e77 100644 --- a/chromium/tools/win/toolchain/toolchain.py +++ b/chromium/tools/win/toolchain/toolchain.py @@ -630,9 +630,8 @@ def GenerateTopLevelEnv(target_dir, vsversion): file.write('@echo off\n') file.write(':: Generated by tools\\win\\toolchain\\toolchain.py.\n') file.write(':: Targeting VS%s.\n' % vsversion) - file.write('set GYP_DEFINES=windows_sdk_path="%s" ' - 'component=shared_library\n' % ( - os.path.join(target_dir, 'win8sdk'))) + file.write('set GYP_DEFINES=windows_sdk_path="%s"\n' % ( + os.path.join(target_dir, 'win8sdk'))) file.write('set GYP_MSVS_VERSION=%se\n' % vsversion) file.write('set GYP_MSVS_OVERRIDE_PATH=%s\n' % target_dir) file.write('set GYP_GENERATORS=ninja\n') diff --git a/chromium/tools/win/toolchain/toolchain2013.py b/chromium/tools/win/toolchain/toolchain2013.py index 9b886d4a70a..a1e2bf0ca60 100644 --- a/chromium/tools/win/toolchain/toolchain2013.py +++ b/chromium/tools/win/toolchain/toolchain2013.py @@ -160,8 +160,7 @@ def GenerateTopLevelEnv(target_dir, pro): with open(os.path.join(target_dir, r'env.bat'), 'w') as file: file.write('@echo off\n') file.write(':: Generated by tools\\win\\toolchain\\toolchain2013.py.\n') - file.write('set GYP_DEFINES=windows_sdk_path="%~dp0win8sdk" ' - 'component=shared_library\n') + file.write('set GYP_DEFINES=windows_sdk_path="%~dp0win8sdk"\n') file.write('set GYP_MSVS_VERSION=2013%s\n' % '' if pro else 'e') file.write('set GYP_MSVS_OVERRIDE_PATH=%~dp0\n') file.write('set GYP_GENERATORS=ninja\n') -- cgit v1.2.1