Update snapshot scripts to Chromium 49

The multi megabyte ICU assembler files are now omitted, as we instead
either generate data files or use system ICU.

Task-number: QTBUG-51173
Change-Id: I7c7594be08876751ffd73171550000a28399954f
Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>

4 files changed, 10 insertions, 6 deletions

diff --git a/src/3rdparty b/src/3rdparty
-Subproject d69f88a52a2db19ce3bda4fd0ab6633b65f12d6
+Subproject babffba0a1c1ee80f0ef6588df615bfd54574ad
diff --git a/src/core/config/embedded_linux.pri b/src/core/config/embedded_linux.pri
index 3a58e0e4b..4cb7d89fb 100644
--- a/src/core/config/embedded_linux.pri
+++ b/src/core/config/embedded_linux.pri
@@ -35,7 +35,6 @@ GYP_CONFIG += \
     use_libpci=0 \
     use_ozone=1 \
     use_system_fontconfig=1 \
-    icu_use_data_file_flag=0 \
     use_x11=0 \
     v8_use_snapshot=false \
     want_separate_host_toolset=1 \
diff --git a/tools/scripts/take_snapshot.py b/tools/scripts/take_snapshot.py
index 04f53de88..767742dc4 100755
--- a/tools/scripts/take_snapshot.py
+++ b/tools/scripts/take_snapshot.py
@@ -84,7 +84,7 @@ def isInChromiumBlacklist(file_path):
             not '/app/theme/' in file_path and
             not '/app/resources/' in file_path and
             not '/browser/printing/' in file_path and
-            not '/browser/resources/' in file_path and
+            not ('/browser/resources/' in file_path and not '/chromeos/' in file_path) and
             not '/renderer/resources/' in file_path and
             not 'repack_locales' in file_path and
             not 'third_party/chromevox' in file_path and
@@ -110,18 +110,22 @@ def isInChromiumBlacklist(file_path):
             not file_path.startswith('components/error_page') and
             not file_path.startswith('components/keyed_service') and
             not file_path.startswith('components/mime_util') and
+            not file_path.startswith('components/precache') and
             not file_path.startswith('components/pref_registry') and
             not file_path.startswith('components/printing') and
             not file_path.startswith('components/resources') and
             not file_path.startswith('components/scheduler') and
             not file_path.startswith('components/security_interstitials') and
+            not file_path.startswith('components/startup_metric_utils') and
             not file_path.startswith('components/strings') and
             not file_path.startswith('components/tracing') and
             not file_path.startswith('components/url_formatter') and
             not file_path.startswith('components/user_prefs') and
+            not file_path.startswith('components/version_') and
             not file_path.startswith('components/visitedlink') and
             not file_path.startswith('components/web_cache') and
             not file_path.startswith('components/webcrypto') and
+            not file_path.startswith('components/webusb') and
             not file_path.endswith('.grd') and
             not file_path.endswith('.grdp') and
             not 'components_strings' in file_path)
@@ -157,12 +161,12 @@ def isInChromiumBlacklist(file_path):
         or file_path.startswith('third_party/bison')
         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')
         or file_path.startswith('third_party/chromite')
         or file_path.startswith('third_party/cld_2')
         or file_path.startswith('third_party/codesighs')
         or file_path.startswith('third_party/colorama')
-        or file_path.startswith('third_party/cros_system_api')
         or file_path.startswith('third_party/cygwin')
         or file_path.startswith('third_party/cython')
         or file_path.startswith('third_party/deqp')
@@ -174,13 +178,13 @@ def isInChromiumBlacklist(file_path):
         or file_path.startswith('third_party/google_appengine_cloudstorage')
         or file_path.startswith('third_party/google_toolbox_for_mac')
         or file_path.startswith('third_party/hunspell_dictionaries')
+        or (file_path.startswith('third_party/icu') and file_path.endswith('icudtl_dat.S'))
         or file_path.startswith('third_party/instrumented_libraries')
         or file_path.startswith('third_party/jsr-305/src')
         or file_path.startswith('third_party/junit')
         or file_path.startswith('third_party/libphonenumber')
         or file_path.startswith('third_party/libaddressinput')
         or file_path.startswith('third_party/libc++')
-        or file_path.startswith('third_party/libc++abi')
         or file_path.startswith('third_party/liblouis')
         or file_path.startswith('third_party/lighttpd')
         or file_path.startswith('third_party/markdown')
@@ -188,6 +192,7 @@ def isInChromiumBlacklist(file_path):
         or file_path.startswith('third_party/nacl_sdk_binaries')
         or (file_path.startswith('third_party/polymer') and
             not file_path.startswith('third_party/polymer/v1_0/components-chromium/'))
+        or file_path.startswith('third_party/openh264/src/res')
         or file_path.startswith('third_party/pdfsqueeze')
         or file_path.startswith('third_party/pefile')
         or file_path.startswith('third_party/perl')
diff --git a/tools/scripts/version_resolver.py b/tools/scripts/version_resolver.py
index 66a09e15d..0aaaa58ee 100644
--- a/tools/scripts/version_resolver.py
+++ b/tools/scripts/version_resolver.py
@@ -38,8 +38,8 @@ import json
 import urllib2
 import git_submodule as GitSubmodule
 
-chromium_version = '47.0.2526.109'
-chromium_branch = '2526'
+chromium_version = '49.0.2623.48'
+chromium_branch = '2623'
 ninja_version = 'v1.6.0'
 
 json_url = 'http://omahaproxy.appspot.com/all.json'