libvpx: Disable assembly optimizations in MemorySanitizer builds.

libvpx.gyp

Index: libvpx.gyp
===================================================================
--- libvpx.gyp	(revision 259902)
+++ libvpx.gyp	(working copy)
@@ -13,14 +13,20 @@
         '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)',
+              }],
+            ],
           }],
         ],
       }],
@@ -56,7 +62,7 @@
     ['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"', {
@@ -126,22 +132,29 @@
               ],
             }],
             ['target_arch=="x64"', {
-              'includes': [
-                'libvpx_srcs_x86_64.gypi',
+              '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',
+                  ],
+                }],
               ],
-              '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': {