libvpx: Disable assembly optimizations in MemorySanitizer builds.

libvpx.gyp

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 {
   'variables': {
     'libvpx_build_vp9%': 1,
     'libvpx_source%': 'source/libvpx',
     'conditions': [
       ['os_posix==1', {
         'asm_obj_extension': 'o',
       }],
       ['OS=="win"', {
         'asm_obj_extension': 'obj',
       }],
 
-      ['(target_arch=="arm" or target_arch=="armv7") and arm_neon==1', {
-        'target_arch_full': 'arm-neon',
+      ['msan==1', {
+        'target_arch_full': 'generic',
       }, {
         'conditions': [
-          ['OS=="android" and ((target_arch=="arm" or target_arch=="armv7") and arm_neon==0)', {
-            'target_arch_full': 'arm-neon-cpu-detect',
+          ['(target_arch=="arm" or target_arch=="armv7") and arm_neon==1', {
+            'target_arch_full': 'arm-neon',
           }, {
-           'target_arch_full': '<(target_arch)',
+            'conditions': [
+              ['OS=="android" and ((target_arch=="arm" or target_arch=="armv7") and arm_neon==0)', {
+                'target_arch_full': 'arm-neon-cpu-detect',
+              }, {
+               'target_arch_full': '<(target_arch)',
+              }],
+            ],
           }],
         ],
       }],
 
       ['os_posix == 1 and OS != "mac"', {
         'OS_CATEGORY%': 'linux',
       }, {
         'OS_CATEGORY%': '<(OS)',
       }],
     ],
@@ skipping 15 matching lines @@
           # crbug.com/352476).
           'optimize' :'size',
         }],
       ],
     },
   },
   'conditions': [
     ['target_arch=="ia32"', {
       'includes': ['libvpx_srcs_x86_intrinsics.gypi', ],
     }],
-    ['target_arch=="x64"', {
+    ['target_arch=="x64" and msan==0', {
       'includes': ['libvpx_srcs_x86_64_intrinsics.gypi', ],
     }],
     [ '(target_arch=="arm" or target_arch=="armv7") and arm_neon==0 and OS=="android"', {
       # When building for targets which may not have NEON (but may!), include
       # support for neon and hide it behind Android cpu-features.
       'includes': ['libvpx_srcs_arm_neon_cpu_detect_intrinsics.gypi', ],
     }],
     [ '(target_arch != "arm" and target_arch != "armv7") and target_arch != "mipsel"', {
       'targets': [
         {
@@ skipping 49 matching lines @@
                 'libvpx_intrinsics_ssse3',
                 # Currently no sse4_1 intrinsic functions
                 #'libvpx_intrinsics_sse4_1',
                 # Currently no avx intrinsic functions
                 #'libvpx_intrinsics_avx',
                 # Add avx2 support when VS2013 lands: crbug.com/328981
                 #'libvpx_intrinsics_avx2',
               ],
             }],
             ['target_arch=="x64"', {
-              'includes': [
-                'libvpx_srcs_x86_64.gypi',
-              ],
-              'dependencies': [
-                'libvpx_intrinsics_mmx',
-                'libvpx_intrinsics_sse2',
-                # Currently no sse3 intrinsic functions
-                #'libvpx_intrinsics_sse3',
-                'libvpx_intrinsics_ssse3',
-                # Currently no sse4_1 intrinsic functions
-                #'libvpx_intrinsics_sse4_1',
-                # Currently no avx intrinsic functions
-                #'libvpx_intrinsics_avx',
-                # Add avx2 support when VS2013 lands: crbug.com/328981
-                #'libvpx_intrinsics_avx2',
+              'conditions': [
+                ['msan==1', {
+                  'includes': [ 'libvpx_srcs_generic.gypi', ],
+                }, {
+                  'includes': [
+                    'libvpx_srcs_x86_64.gypi',
+                    'libvpx_srcs_nacl.gypi',
+                  ],
+                  'dependencies': [
+                    'libvpx_intrinsics_mmx',
+                    'libvpx_intrinsics_sse2',
+                    # Currently no sse3 intrinsic functions
+                    #'libvpx_intrinsics_sse3',
+                    'libvpx_intrinsics_ssse3',
+                    # Currently no sse4_1 intrinsic functions
+                    #'libvpx_intrinsics_sse4_1',
+                    # Currently no avx intrinsic functions
+                    #'libvpx_intrinsics_avx',
+                    # Add avx2 support when VS2013 lands: crbug.com/328981
+                    #'libvpx_intrinsics_avx2',
+                  ],
+                }],
               ],
             }],
             ['clang == 1', {
               'xcode_settings': {
                 'WARNING_CFLAGS': [
                   # libvpx heavily relies on implicit enum casting.
                   '-Wno-conversion',
                   # libvpx does `if ((a == b))` in some places.
                   '-Wno-parentheses-equality',
                 ],
@@ skipping 399 matching lines @@
          # Need this otherwise gyp won't run the rule on them.
           'sources': [
             '<(INTERMEDIATE_DIR)/vpx_scale_asm_offsets.o',
           ],
         }],
       ],
       'includes': ['obj_int_extract.gypi'],
     },
   ],
 }