summaryrefslogtreecommitdiff
path: root/chromium/build
diff options
context:
space:
mode:
authorAndras Becsi <andras.becsi@digia.com>2014-05-22 18:24:25 +0200
committerAndras Becsi <andras.becsi@digia.com>2014-06-04 16:32:40 +0200
commit4ce69f7403811819800e7c5ae1318b2647e778d1 (patch)
tree2ec3a98b5abef002670a0916354eb7e0abfe2aa2 /chromium/build
parenta6dd70e0328d155d5df8d6df48afbab690b08fb6 (diff)
downloadqtwebengine-chromium-4ce69f7403811819800e7c5ae1318b2647e778d1.tar.gz
Update Chromium snapshot to stable version 33.0.1750.170
This is meant as a baseline commit hence it does not include the patches we need to apply for QtWebEngine. All patches should be rebased on top of this commit so we can get rid of the external patches directory. In future these baseline commits always have to include the exact Chromium version returned by version_resolver.py's currentVersion() in their first line, so that we can retrieve the patches on top to apply on the upstream repository. This also includes a ninja update. Change-Id: I60abeadb785a3b7d149c58b65ddb5a823fed3083 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Diffstat (limited to 'chromium/build')
-rw-r--r--chromium/build/common.gypi37
-rwxr-xr-xchromium/build/linux/python_arch.sh4
-rw-r--r--chromium/build/linux/system.gyp10
-rw-r--r--chromium/build/util/LASTCHANGE2
-rw-r--r--chromium/build/util/LASTCHANGE.blink2
5 files changed, 9 insertions, 46 deletions
diff --git a/chromium/build/common.gypi b/chromium/build/common.gypi
index e975a96cd52..d7b385cc0ee 100644
--- a/chromium/build/common.gypi
+++ b/chromium/build/common.gypi
@@ -343,7 +343,7 @@
# Run tools/clang/scripts/update.sh to make sure they are compiled.
# This causes 'clang_chrome_plugins_flags' to be set.
# Has no effect if 'clang' is not set as well.
- 'clang_use_chrome_plugins%': 0,
+ 'clang_use_chrome_plugins%': 1,
# Enable building with ASAN (Clang's -fsanitize=address option).
# -fsanitize=address only works with clang, but asan=1 implies clang=1
@@ -1232,9 +1232,6 @@
# rlz codes for searches but do not use the library.
'enable_rlz%': 0,
- # Compile with libc++ instead of libstdc++.
- 'use_libcpp%' : 0,
-
# Turns on the i18n support in V8.
'v8_enable_i18n_support': 1,
@@ -1515,10 +1512,10 @@
# someplace that Xcode doesn't know about, set mac_sdk_path to the
# path to the SDK; when set to a non-empty string, SDK detection
# based on mac_sdk_min will be bypassed entirely.
- 'mac_sdk_min%': '10.7',
+ 'mac_sdk_min%': '10.6',
'mac_sdk_path%': '',
- 'mac_deployment_target%': '10.7',
+ 'mac_deployment_target%': '10.6',
},
'mac_sdk_min': '<(mac_sdk_min)',
@@ -1528,7 +1525,6 @@
# Compile in Breakpad support by default so that it can be
# tested, even if it is not enabled by default at runtime.
'mac_breakpad_compiled_in%': 1,
-
'conditions': [
# mac_product_name is set to the name of the .app bundle as it should
# appear on disk. This duplicates data from
@@ -2138,17 +2134,6 @@
['use_clipboard_aurax11==1', {
'defines': ['USE_CLIPBOARD_AURAX11=1'],
}],
- ['use_libcpp==1', {
- 'defines': ['USE_UNORDERED_CONTAINERS=1'],
- 'cflags_cc': [
- '-Wno-deprecated-declarations',
- '-Wno-newline-eof',
- '-Wno-unused-value',
- '-Wno-unused-variable',
- '-Wno-unused-function',
- '-stdlib=libc++'
- ],
- }],
['enable_one_click_signin==1', {
'defines': ['ENABLE_ONE_CLICK_SIGNIN'],
}],
@@ -3350,7 +3335,7 @@
# Clang considers the `register` keyword as deprecated, but e.g.
# code generated by flex (used in angle) contains that keyword.
# http://crbug.com/255186
- '-Wno-deprecated',
+ '-Wno-deprecated-register',
],
'cflags!': [
# Clang doesn't seem to know know this flag.
@@ -4058,19 +4043,7 @@
# Clang considers the `register` keyword as deprecated, but e.g.
# code generated by flex (used in angle) contains that keyword.
# http://crbug.com/255186
- '-Wno-deprecated',
- ],
- }],
- ['use_libcpp==1', {
- 'OTHER_CPLUSPLUSFLAGS': ['-stdlib=libc++'],
- 'USE_LIBCPP': 'YES',
- 'WARNING_CFLAGS': [
- '-Wno-deprecated-declarations',
- '-Wno-newline-eof',
- '-Wno-unused-value',
- '-Wno-unused-variable',
- '-Wno-unused-function',
- '-Wno-header-hygiene',
+ '-Wno-deprecated-register',
],
}],
['clang==1 and clang_use_chrome_plugins==1', {
diff --git a/chromium/build/linux/python_arch.sh b/chromium/build/linux/python_arch.sh
index e0f63bc6b04..3a41f94a980 100755
--- a/chromium/build/linux/python_arch.sh
+++ b/chromium/build/linux/python_arch.sh
@@ -11,9 +11,7 @@
#
file_out=$(file --dereference "$1")
-# The POSIX spec says that `file` should not exit(1) if the file does not
-# exist, so do our own -e check to catch things.
-if [ $? -ne 0 ] || [ ! -e "$1" ] ; then
+if [ $? -ne 0 ]; then
echo unknown
exit 0
fi
diff --git a/chromium/build/linux/system.gyp b/chromium/build/linux/system.gyp
index 9911317e2fb..4a7e857efc1 100644
--- a/chromium/build/linux/system.gyp
+++ b/chromium/build/linux/system.gyp
@@ -29,7 +29,7 @@
'use_system_ssl%': 1,
},
}],
- [ 'chromeos==0 and use_qt==0', {
+ [ 'chromeos==0', {
# Hide GTK and related dependencies for Chrome OS, so they won't get
# added back to Chrome OS. Don't try to use GTK on Chrome OS.
'targets': [
@@ -506,8 +506,6 @@
{
'target_name': 'libpci',
'type': 'static_library',
- 'conditions': [
- ['use_x11==1', {
'cflags': [
'<!@(<(pkg-config) --cflags libpci)',
],
@@ -568,8 +566,6 @@
'process_outputs_as_sources': 1,
},
],
- }],
- ],
},
{
'target_name': 'libresolv',
@@ -664,8 +660,6 @@
'type': 'none',
'toolsets': ['host', 'target'],
'conditions': [
- ['use_pango==1', {
- 'conditions': [
['_toolset=="target"', {
'direct_dependent_settings': {
'cflags': [
@@ -696,8 +690,6 @@
},
}],
],
- }],
- ],
},
{
'target_name': 'ssl',
diff --git a/chromium/build/util/LASTCHANGE b/chromium/build/util/LASTCHANGE
index b9510addb6c..8eb16b7d774 100644
--- a/chromium/build/util/LASTCHANGE
+++ b/chromium/build/util/LASTCHANGE
@@ -1 +1 @@
-LASTCHANGE=255236
+LASTCHANGE=258314
diff --git a/chromium/build/util/LASTCHANGE.blink b/chromium/build/util/LASTCHANGE.blink
index 2b43df4ca86..2193b4ba815 100644
--- a/chromium/build/util/LASTCHANGE.blink
+++ b/chromium/build/util/LASTCHANGE.blink
@@ -1 +1 @@
-LASTCHANGE=168543
+LASTCHANGE=169177