diff options
| author | Zeno Albisser <zeno.albisser@digia.com> | 2014-03-22 00:04:29 +0100 |
|---|---|---|
| committer | Zeno Albisser <zeno.albisser@digia.com> | 2014-04-23 14:53:06 +0200 |
| commit | 0bfb47de4e2ebc8f9ccf915e84aae3e37feeb2af (patch) | |
| tree | 82e3665c3f3c7efcb1dc8d64ec9d672d369e85d2 /chromium/third_party/openssl/openssl.gypi | |
| parent | 851eff42d87e5af425dcd5008c3c53dde119536c (diff) | |
| download | qtwebengine-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/third_party/openssl/openssl.gypi')
| -rw-r--r-- | chromium/third_party/openssl/openssl.gypi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chromium/third_party/openssl/openssl.gypi b/chromium/third_party/openssl/openssl.gypi index 856b72ef9ef..6a2ca702d19 100644 --- a/chromium/third_party/openssl/openssl.gypi +++ b/chromium/third_party/openssl/openssl.gypi @@ -566,7 +566,7 @@ 'openssl/crypto/aes/asm/aes-armv4.S', 'openssl/crypto/bn/asm/armv4-gf2m.S', 'openssl/crypto/bn/asm/armv4-mont.S', - 'openssl/crypto/chacha/chacha_vec_arm.S', + 'openssl/crypto/chacha/chacha_vec.c', 'openssl/crypto/modes/asm/ghash-armv4.S', 'openssl/crypto/poly1305/poly1305_arm.c', 'openssl/crypto/poly1305/poly1305_arm_asm.S', |