From ab94349cb2fa073e8aec661a797de1cfc3819752 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Wed, 25 Jan 2017 15:09:31 +0100 Subject: Simple adaptations to Chromium 55 The simplest adaptations to API and build changes in Chromium 55 Change-Id: I923fa188690a04902492317807f72f006bcab9c6 Reviewed-by: Michal Klocek --- tools/qmake/mkspecs/features/configure.prf | 8 +++++++- tools/qmake/mkspecs/features/functions.prf | 13 +++++++++---- tools/scripts/init-repository.py | 1 + tools/scripts/take_snapshot.py | 23 ++++++++--------------- tools/scripts/version_resolver.py | 6 +++--- 5 files changed, 28 insertions(+), 23 deletions(-) (limited to 'tools') diff --git a/tools/qmake/mkspecs/features/configure.prf b/tools/qmake/mkspecs/features/configure.prf index b0e09aca0..b17626c3e 100644 --- a/tools/qmake/mkspecs/features/configure.prf +++ b/tools/qmake/mkspecs/features/configure.prf @@ -35,9 +35,11 @@ defineTest(runConfigure) { } isQtMinimum(5, 9) { qtConfig(appstore-compliant): WEBENGINE_CONFIG += use_appstore_compliant_code - linux: !cross_compile: use_gold_linker: WEBENGINE_CONFIG += use_gn + linux: !cross_compile: WEBENGINE_CONFIG += use_gn macos: WEBENGINE_CONFIG += use_gn + win32: WEBENGINE_CONFIG += use_gn } + !use?(gn): skipBuild("Chromium 55 and new can only be built with GN") linux { QT_FOR_CONFIG += gui-private @@ -51,6 +53,10 @@ defineTest(runConfigure) { packagesExist("\'harfbuzz >= 1.2.0\'"): WEBENGINE_CONFIG += use_system_harfbuzz else: log("System harfbuzz is too old (min. version 1.2). Using Chromium's copy.$${EOL}") } + qtConfig(glib) { + packagesExist("\'glib-2.0 >= 2.32.0\'"): WEBENGINE_CONFIG += use_glib + else: skipBuild("System glib is too old (min. version 2.32).$${EOL}") + } !contains(WEBENGINE_CONFIG, embedded_build): REQUIRED_PACKAGES += libpci for(package, $$list($$REQUIRED_PACKAGES)) { diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf index a26dbed48..6ef87f867 100644 --- a/tools/qmake/mkspecs/features/functions.prf +++ b/tools/qmake/mkspecs/features/functions.prf @@ -47,10 +47,10 @@ defineTest(isPlatformSupported) { skipBuild("Using XCode version $$QMAKE_XCODE_VERSION, but at least version 5.1 is required to build Qt WebEngine.") return(false) } - # We require OS X 10.9 (darwin version 13.0.0) or newer + # We require OS X 10.0 (darwin version 14.0.0) or newer darwin_major_version = $$section(QMAKE_HOST.version, ., 0, 0) - lessThan(darwin_major_version, 13) { - skipBuild("Qt WebEngine requires OS X version 10.9 or newer.") + lessThan(darwin_major_version, 14) { + skipBuild("Qt WebEngine requires OS X version 10.10 or newer.") return(false) } !isMinOSXSDKVersion(10, 10): { @@ -223,8 +223,13 @@ defineTest(isGCCVersionSupported) { return(false) } +defineTest(isDeveloperBuild) { + qtConfig(private_tests): return(true) # enabled for developer-build + return(false) +} + defineTest(isQMLTestSupportApiEnabled) { - qtConfig(private_tests): return(true) # enable for developer-build + isDeveloperBuild(): return(true) contains(QT_BUILD_PARTS, tests): return(true) contains(WEBENGINE_CONFIG, testsupport): return(true) return(false) diff --git a/tools/scripts/init-repository.py b/tools/scripts/init-repository.py index 9fd951be4..dc5cdb8ce 100755 --- a/tools/scripts/init-repository.py +++ b/tools/scripts/init-repository.py @@ -80,6 +80,7 @@ def updateLastChange(): print 'updating LASTCHANGE files' subprocess.call(['python', 'build/util/lastchange.py', '-o', 'build/util/LASTCHANGE']) subprocess.call(['python', 'build/util/lastchange.py', '-s', 'third_party/WebKit', '-o', 'build/util/LASTCHANGE.blink']) + subprocess.call(['python', 'build/util/lastchange.py', '-m', 'SKIA_COMMIT_HASH', '-s', 'third_party/skia', '--header', 'skia/ext/skia_commit_hash.h']) os.chdir(currentDir) def initUpstreamSubmodules(): diff --git a/tools/scripts/take_snapshot.py b/tools/scripts/take_snapshot.py index 78b8066ca..7af70bf22 100755 --- a/tools/scripts/take_snapshot.py +++ b/tools/scripts/take_snapshot.py @@ -76,10 +76,8 @@ def isInChromiumBlacklist(file_path): or file_path.startswith('android_webview') or file_path.startswith('apps/') or file_path.startswith('ash/') - or file_path.startswith('athena') - or file_path.startswith('base/android/java') + or file_path.startswith('base/android') or file_path.startswith('breakpad') - or file_path.startswith('build/android/') or file_path.startswith('buildtools/clang_format/script') or (file_path.startswith('chrome/') and not file_path.startswith('chrome/VERSION') and @@ -91,8 +89,8 @@ def isInChromiumBlacklist(file_path): not '/renderer/resources/' in file_path and not 'repack_locales' in file_path and not 'third_party/chromevox' in file_path and - not 'media/desktop_media_list.h' in file_path and - not 'media/desktop_streams_registry.' in file_path and + not 'media/webrtc/desktop_media_list.h' in file_path and + not 'media/webrtc/desktop_streams_registry.' in file_path and not 'common/chrome_constants.' in file_path and not 'common/chrome_paths' in file_path and not 'common/chrome_switches.' in file_path and @@ -113,8 +111,8 @@ def isInChromiumBlacklist(file_path): not file_path.endswith('.json') and not file_path.endswith('chrome_version.rc.version')) or file_path.startswith('chrome_frame') + or file_path.startswith('chromecast') or file_path.startswith('chromeos') - or file_path.startswith('cloud_print') or file_path.startswith('components/chrome_apps/') or file_path.startswith('components/cronet/') or file_path.startswith('components/drive/') @@ -126,7 +124,7 @@ def isInChromiumBlacklist(file_path): or file_path.startswith('components/proximity_auth/') or (file_path.startswith('components/resources/terms/') and not file_path.endswith('terms_chromium.html')) or file_path.startswith('components/rlz/') - or file_path.startswith('components/sync_driver/') + or file_path.startswith('components/sync/') or file_path.startswith('components/test/') or file_path.startswith('components/test_runner/') or file_path.startswith('components/translate/') @@ -142,7 +140,6 @@ def isInChromiumBlacklist(file_path): or file_path.startswith('net/android/java') or file_path.startswith('remoting') or file_path.startswith('rlz') - or file_path.startswith('sync') or file_path.startswith('testing/android') or file_path.startswith('testing/buildbot') or file_path.startswith('third_party/WebKit/LayoutTests') @@ -158,13 +155,7 @@ def isInChromiumBlacklist(file_path): or (file_path.startswith('third_party/cacheinvalidation') and not file_path.endswith('isolate')) or file_path.startswith('third_party/boringssl/src/fuzz') - or (file_path.startswith('third_party/catapult') and not - (file_path.startswith('third_party/catapult/third_party/py_vulcanize') - or file_path.startswith('third_party/catapult/tracing/tracing/') - or file_path.startswith('third_party/catapult/tracing/tracing_build') - or file_path.startswith('third_party/catapult/tracing/third_party') - or file_path.startswith('third_party/catapult/tracing/bin') - or file_path.endswith('tracing_project.py'))) + or file_path.startswith('third_party/catapult') or file_path.startswith('third_party/chromite') or file_path.startswith('third_party/cld_2') or file_path.startswith('third_party/codesighs') @@ -173,6 +164,7 @@ def isInChromiumBlacklist(file_path): or file_path.startswith('third_party/cython') or file_path.startswith('third_party/deqp') or file_path.startswith('third_party/elfutils') + or file_path.startswith('third_party/freetype-android') or file_path.startswith('third_party/google_input_tools') or file_path.startswith('third_party/gperf') or file_path.startswith('third_party/gnu_binutils') @@ -303,6 +295,7 @@ def exportChromium(): # Add LASTCHANGE files which are not tracked by git. files.append('build/util/LASTCHANGE') files.append('build/util/LASTCHANGE.blink') + files.append('skia/ext/skia_commit_hash.h') print 'copying files to ' + third_party_chromium for i in xrange(len(files)): printProgress(i+1, len(files)) diff --git a/tools/scripts/version_resolver.py b/tools/scripts/version_resolver.py index e481f0ed0..b80efff34 100644 --- a/tools/scripts/version_resolver.py +++ b/tools/scripts/version_resolver.py @@ -38,9 +38,9 @@ import json import urllib2 import git_submodule as GitSubmodule -chromium_version = '53.0.2785.148' -chromium_branch = '2785' -ninja_version = 'v1.7.1' +chromium_version = '55.0.2883.105' +chromium_branch = '2883' +ninja_version = 'v1.7.2' json_url = 'http://omahaproxy.appspot.com/all.json' -- cgit v1.2.3