diff options
| author | Michael Brüning <michael.bruning@digia.com> | 2014-07-17 15:48:37 +0200 |
|---|---|---|
| committer | Michael Bruning <michael.bruning@digia.com> | 2014-07-17 16:30:53 +0200 |
| commit | 2e220291159804f8d233417178496184a621c46a (patch) | |
| tree | 68dea7b1bf2de2780f5d13c210e032db13cdb8dc | |
| parent | 395777d9bfb0187c17b84aae7ad0dae77489ddbb (diff) | |
<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 <frederik.gladhorn@digia.com>
| -rw-r--r-- | chromium/tools/win/toolchain/toolchain.py | 5 | ||||
| -rw-r--r-- | 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') |