summaryrefslogtreecommitdiffstats
path: root/tools/scripts
diff options
context:
space:
mode:
authorAndras Becsi <andras.becsi@theqtcompany.com>2015-04-13 13:49:08 +0200
committerAndras Becsi <andras.becsi@theqtcompany.com>2015-04-14 09:16:38 +0000
commite138b30689e49229cbeb0cba8ecd4116e3ee91d5 (patch)
tree9fc4bcf3115fc99ca7f8c8240822aa56b5adf6ca /tools/scripts
parentae15f74a1644f6b02c51e8b4a169671c1d0c9af9 (diff)
Remove eAndroid hooks
Support for the B2Qt/eAndroid platform is discontinued with Qt 5.5 so we can remove all remnants of the android platform. Change-Id: I93f15fcd4a345203e15010ddf1e8de3e8d28ab56 Reviewed-by: Michael BrĂ¼ning <michael.bruning@theqtcompany.com>
Diffstat (limited to 'tools/scripts')
-rw-r--r--tools/scripts/git_submodule.py2
-rwxr-xr-xtools/scripts/take_snapshot.py3
-rw-r--r--tools/scripts/version_resolver.py2
3 files changed, 3 insertions, 4 deletions
diff --git a/tools/scripts/git_submodule.py b/tools/scripts/git_submodule.py
index e5dd9c6cb..93afbacd6 100644
--- a/tools/scripts/git_submodule.py
+++ b/tools/scripts/git_submodule.py
@@ -46,7 +46,7 @@ import subprocess
import sys
import version_resolver as resolver
-extra_os = ['android', 'mac', 'win']
+extra_os = ['mac', 'win']
def subprocessCall(args):
print args
diff --git a/tools/scripts/take_snapshot.py b/tools/scripts/take_snapshot.py
index 4e5465a1e..bd2ec4e56 100755
--- a/tools/scripts/take_snapshot.py
+++ b/tools/scripts/take_snapshot.py
@@ -75,8 +75,7 @@ def isInChromiumBlacklist(file_path):
if ( '_jni' in file_path
or 'jni_' in file_path
or 'testdata/' in file_path
- or (file_path.startswith('third_party/android_tools') and
- not 'android/cpufeatures' in file_path)
+ or file_path.startswith('third_party/android_tools')
or '/tests/' in file_path
or ('/test/' in file_path and
not '/webrtc/test/testsupport/' in file_path and
diff --git a/tools/scripts/version_resolver.py b/tools/scripts/version_resolver.py
index 9a667354e..419fb72d1 100644
--- a/tools/scripts/version_resolver.py
+++ b/tools/scripts/version_resolver.py
@@ -51,7 +51,7 @@ import json
import urllib2
import git_submodule as GitSubmodule
-chromium_version = '40.0.2214.28'
+chromium_version = '40.0.2214.115'
chromium_branch = '2214'
ninja_version = 'v1.5.3'