Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / third_party / libjpeg_turbo / libjpeg.gyp

diff --git a/src/third_party/libjpeg_turbo/libjpeg.gyp b/src/third_party/libjpeg_turbo/libjpeg.gyp
index 03dc537..8f4d193 100644 (file)
--- a/src/third_party/libjpeg_turbo/libjpeg.gyp
+++ b/src/third_party/libjpeg_turbo/libjpeg.gyp
@@ -136,7 +136,7 @@
             'simd/jsimdcpu.asm',
           ],
         }],
-        [ 'target_arch=="x64"', {
+        [ 'target_arch=="x64" and msan!=1', {
           'sources': [
             'simd/jsimd_x86_64.c',
             'simd/jccolss2-64.asm',
@@ -156,6 +156,13 @@
             'simd/jiss2red-64.asm',
           ],
         }],
+        # MemorySanitizer doesn't support assembly code, so keep it disabled in
+        # MSan builds for now.
+        [ 'msan==1', {
+          'sources': [
+            'jsimd_none.c',
+          ],
+        }],
         # The ARM SIMD implementation can be used for devices that support
         # the NEON instruction set. This can safely be done dynamically by
         # probing CPU features at runtime, if you wish.