diff options
Diffstat (limited to 'chromium')
-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 | 12 | ||||
-rw-r--r-- | chromium/build/linux/system.gyp | 4 | ||||
-rw-r--r-- | chromium/net/net.gyp | 2 | ||||
-rw-r--r-- | chromium/skia/skia_chrome.gypi | 2 | ||||
-rw-r--r-- | chromium/skia/skia_library.gypi | 2 |
7 files changed, 21 insertions, 5 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..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', diff --git a/chromium/build/linux/system.gyp b/chromium/build/linux/system.gyp index 1451afbd214..9911317e2fb 100644 --- a/chromium/build/linux/system.gyp +++ b/chromium/build/linux/system.gyp @@ -506,6 +506,8 @@ { 'target_name': 'libpci', 'type': 'static_library', + 'conditions': [ + ['use_x11==1', { 'cflags': [ '<!@(<(pkg-config) --cflags libpci)', ], @@ -566,6 +568,8 @@ 'process_outputs_as_sources': 1, }, ], + }], + ], }, { 'target_name': 'libresolv', 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': [ diff --git a/chromium/skia/skia_chrome.gypi b/chromium/skia/skia_chrome.gypi index 6dcc6654fdd..5559f57c1aa 100644 --- a/chromium/skia/skia_chrome.gypi +++ b/chromium/skia/skia_chrome.gypi @@ -117,7 +117,7 @@ 'target_conditions': [ # Pull in specific linux files for android (which have been filtered out # by file name rules). - [ 'OS == "android"', { + [ 'OS == "android" or qt_os == "embedded_linux"', { 'sources/': [ ['include', 'ext/platform_device_linux\\.cc$'], ], diff --git a/chromium/skia/skia_library.gypi b/chromium/skia/skia_library.gypi index b957fa665b5..effde33097b 100644 --- a/chromium/skia/skia_library.gypi +++ b/chromium/skia/skia_library.gypi @@ -270,7 +270,7 @@ '../third_party/skia/src/opts/opts_check_SSE2.cpp' ], }], - [ 'desktop_linux == 1 or chromeos == 1', { + [ 'desktop_linux == 1 or chromeos == 1 or qt_os=="embedded_linux"', { 'dependencies': [ '../build/linux/system.gyp:fontconfig', '../build/linux/system.gyp:freetype2', |