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/base | |
| 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/base')
| -rw-r--r-- | chromium/base/atomicops_internals_arm_gcc.h | 2 | ||||
| -rw-r--r-- | chromium/base/base.gyp | 2 | ||||
| -rw-r--r-- | chromium/base/base.gypi | 7 |
3 files changed, 9 insertions, 2 deletions
diff --git a/chromium/base/atomicops_internals_arm_gcc.h b/chromium/base/atomicops_internals_arm_gcc.h index 9f4fe2e586e..1964041b8a7 100644 --- a/chromium/base/atomicops_internals_arm_gcc.h +++ b/chromium/base/atomicops_internals_arm_gcc.h @@ -53,7 +53,7 @@ inline void MemoryBarrier() { #if defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__) || \ defined(__ARM_ARCH_7R__) || defined(__ARM_ARCH_7M__) || \ defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) || \ - defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6Z__) || \ + defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6Z__) || defined(__ARM_ARCH_6ZK__) || \ defined(__ARM_ARCH_6KZ__) || defined(__ARM_ARCH_6T2__) inline Atomic32 NoBarrier_CompareAndSwap(volatile Atomic32* ptr, diff --git a/chromium/base/base.gyp b/chromium/base/base.gyp index 407d49d0582..b5af9d76e1a 100644 --- a/chromium/base/base.gyp +++ b/chromium/base/base.gyp @@ -35,7 +35,7 @@ ], }, 'conditions': [ - ['desktop_linux == 1 or chromeos == 1', { + ['desktop_linux == 1 or chromeos == 1 or qt_os == "embedded_linux"', { 'conditions': [ ['chromeos==1', { 'sources/': [ ['include', '_chromeos\\.cc$'] ] diff --git a/chromium/base/base.gypi b/chromium/base/base.gypi index 11edab00968..26aacafcae2 100644 --- a/chromium/base/base.gypi +++ b/chromium/base/base.gypi @@ -722,6 +722,13 @@ '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_glib)==0 or >(nacl_untrusted_build)==1', { 'sources!': [ 'message_loop/message_pump_glib.cc', |