summaryrefslogtreecommitdiff
path: root/chromium/net/net.gyp
diff options
context:
space:
mode:
authorZeno Albisser <zeno.albisser@digia.com>2014-03-22 00:04:29 +0100
committerZeno Albisser <zeno.albisser@digia.com>2014-04-23 14:53:06 +0200
commit0bfb47de4e2ebc8f9ccf915e84aae3e37feeb2af (patch)
tree82e3665c3f3c7efcb1dc8d64ec9d672d369e85d2 /chromium/net/net.gyp
parent851eff42d87e5af425dcd5008c3c53dde119536c (diff)
downloadqtwebengine-chromium-0bfb47de4e2ebc8f9ccf915e84aae3e37feeb2af.tar.gz
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. - Use chacha_vec.c to avoid hard/soft float mismatch. Change-Id: I8dd21c480922f32ac7111ea5582d82c249414caa Reviewed-by: Pierre Rossi <pierre.rossi@gmail.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': [