summaryrefslogtreecommitdiff
path: root/chromium/net/net.gyp
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/net/net.gyp
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/net/net.gyp')
-rw-r--r--chromium/net/net.gyp2
1 files changed, 1 insertions, 1 deletions
diff --git a/chromium/net/net.gyp b/chromium/net/net.gyp
index c2d618ef220..69f482751c9 100644
--- a/chromium/net/net.gyp
+++ b/chromium/net/net.gyp
@@ -1366,7 +1366,7 @@
'../build/linux/system.gyp:gio',
],
}],
- [ 'desktop_linux == 1 or chromeos == 1', {
+ [ 'desktop_linux == 1 or chromeos == 1 or qt_os == "embedded_linux"', {
'conditions': [
['use_openssl==1', {
'dependencies': [