diff options
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/buildscripts/gyp_qtwebengine | 16 | ||||
| -rw-r--r-- | tools/scripts/version_resolver.py | 4 |
2 files changed, 6 insertions, 14 deletions
diff --git a/tools/buildscripts/gyp_qtwebengine b/tools/buildscripts/gyp_qtwebengine index 29d33a802..1bda49855 100755 --- a/tools/buildscripts/gyp_qtwebengine +++ b/tools/buildscripts/gyp_qtwebengine @@ -77,16 +77,6 @@ if __name__ == '__main__': if 'qt_cross_compile=1' in sys.argv: os.environ['GYP_CROSSCOMPILE'] = '1' - # On Windows we have to update the path of Chromium's Cygwin in registry to ensure current build - # uses Cygwin from the current source directory. - if sys.platform.startswith('win32'): - print 'Updating Cygwin\'s path in registry...' - setup_mount = os.path.abspath(os.path.join(chrome_src,'third_party','cygwin','setup_mount.bat')) - ret = subprocess.call(setup_mount) - if ret != 0: - print 'Failed to run', setup_mount - sys.exit(1) - # On Mac we want to override CXX and CC that is provided with # the Chromium GYP environment. if sys.platform.startswith('darwin') and not 'GYP_CROSSCOMPILE' in os.environ: @@ -141,10 +131,12 @@ if __name__ == '__main__': args.extend(['-D', 'qtwebengine_root=' + qtwebengine_root]) args.extend(['-D', 'chromium_src_dir=' + chrome_src]) - # linux_use_gold_binary currently relies on a hardcoded relative path from chromium/src/out/(Release|Debug) + # linux_use_bundled_gold currently relies on a hardcoded relative path from chromium/src/out/(Release|Debug) # Disable it along with the -Wl,--threads flag just in case gold isn't installed on the system. - args.extend(['-D', 'linux_use_gold_binary=0']) + args.extend(['-D', 'linux_use_bundled_gold=0']) + args.extend(['-D', 'linux_use_bundled_binutils=0']) args.extend(['-D', 'linux_use_gold_flags=0']) + args.extend(['-D', 'clang_use_chrome_plugins=0']) # Trigger Qt-specific build conditions. args.extend(['-D', 'use_qt=1']) # Tweak the output location and format (hardcode ninja for now if not set) diff --git a/tools/scripts/version_resolver.py b/tools/scripts/version_resolver.py index 396fc626a..0a9ed813b 100644 --- a/tools/scripts/version_resolver.py +++ b/tools/scripts/version_resolver.py @@ -51,8 +51,8 @@ import json import urllib2 import git_submodule as GitSubmodule -chromium_version = '33.0.1750.170' -chromium_branch = '1750' +chromium_version = '37.0.2062.68' +chromium_branch = '2062' json_url = 'http://omahaproxy.appspot.com/all.json' git_deps_url = 'http://src.chromium.org/chrome/branches/' + chromium_branch + '/src/.DEPS.git' |