summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
Diffstat (limited to 'tools')
-rw-r--r--tools/qmake/mkspecs/features/functions.prf1
-rw-r--r--tools/scripts/git_submodule.py2
-rwxr-xr-xtools/scripts/take_snapshot.py3
-rw-r--r--tools/scripts/version_resolver.py2
4 files changed, 3 insertions, 5 deletions
diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf
index 2b42346f..ef0320da 100644
--- a/tools/qmake/mkspecs/features/functions.prf
+++ b/tools/qmake/mkspecs/features/functions.prf
@@ -73,7 +73,6 @@ defineReplace(getChromiumSrcDir) {
defineReplace(extractCFlag) {
CFLAGS = $$QMAKE_CC $$QMAKE_CFLAGS
- !isEmpty(ANDROID_TARGET_CFLAGS): CFLAGS = $$ANDROID_TARGET_CFLAGS
OPTION = $$find(CFLAGS, $$1)
OPTION = $$split(OPTION, =)
return ($$member(OPTION, 1))
diff --git a/tools/scripts/git_submodule.py b/tools/scripts/git_submodule.py
index e5dd9c6c..93afbacd 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 4e5465a1..bd2ec4e5 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 9a667354..419fb72d 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'