summaryrefslogtreecommitdiff
path: root/chromium/base/base.gypi
diff options
context:
space:
mode:
authorZeno Albisser <zeno.albisser@digia.com>2014-04-23 17:01:18 +0200
committerAndras Becsi <andras.becsi@digia.com>2014-06-04 18:15:02 +0200
commit5beb9a3ceb88fb4c0fa0e57e94b0648dd4b2da4f (patch)
treed64b55816f5d689c6b09a93f48e1c88f6ac302e0 /chromium/base/base.gypi
parent7cd32eefe1af40682a6b3e632be116a12c403665 (diff)
downloadqtwebengine-chromium-5beb9a3ceb88fb4c0fa0e57e94b0648dd4b2da4f.tar.gz
<chromium> Adjust gyp defines for eLinux.
- Add Raspberry PI chipset to list of defined platforms. - Make sure to include sources for xdg support. - Do not use pkg-config-wrapper, as our sysroot pkg-config already returns absolute paths. - Use openssl for eLinux. - Use fontconfig and freetype2 for eLinux. Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com> Change-Id: Ic5266f818432b4432ed1d8a1ac07f434cb5b86e6 Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Diffstat (limited to 'chromium/base/base.gypi')
-rw-r--r--chromium/base/base.gypi12
1 files changed, 12 insertions, 0 deletions
diff --git a/chromium/base/base.gypi b/chromium/base/base.gypi
index 11edab00968..45d71802744 100644
--- a/chromium/base/base.gypi
+++ b/chromium/base/base.gypi
@@ -722,6 +722,18 @@
'atomicops_internals_x86_gcc.cc',
],
}],
+ # We need to include xdg for embedded linux,
+ # but we indeed do not want atomicops for x86.
+ ['qt_os == "embedded_linux"', {
+ 'sources/': [
+ ['include', '^nix/'],
+ ],
+ }],
+ ['use_qt==1 and target_arch=="ia32"', {
+ 'sources/': [
+ ['include', 'atomicops_internals_x86_gcc.cc'],
+ ],
+ }],
['<(use_glib)==0 or >(nacl_untrusted_build)==1', {
'sources!': [
'message_loop/message_pump_glib.cc',