libvpx: Pull from upstream

libvpx_srcs_x86.gypi

Index: libvpx_srcs_x86.gypi
diff --git a/libvpx_srcs_x86.gypi b/libvpx_srcs_x86.gypi
index 11e73b4984fa8fcd427c1ec6511e0e0e4973fd75..d61c186aca5c907884004f902dccba614f2ec967 100644
--- a/libvpx_srcs_x86.gypi
+++ b/libvpx_srcs_x86.gypi
@@ -11,6 +11,7 @@
     '<(libvpx_source)/vp8/common/blockd.h',
     '<(libvpx_source)/vp8/common/coefupdateprobs.h',
     '<(libvpx_source)/vp8/common/common.h',
+    '<(libvpx_source)/vp8/common/copy_c.c',
     '<(libvpx_source)/vp8/common/debugmodes.c',
     '<(libvpx_source)/vp8/common/default_coef_probs.h',
     '<(libvpx_source)/vp8/common/dequantize.c',
@@ -53,7 +54,6 @@
     '<(libvpx_source)/vp8/common/reconintra4x4.c',
     '<(libvpx_source)/vp8/common/reconintra4x4.h',
     '<(libvpx_source)/vp8/common/rtcd.c',
-    '<(libvpx_source)/vp8/common/sad_c.c',
     '<(libvpx_source)/vp8/common/setupintrarecon.c',
     '<(libvpx_source)/vp8/common/setupintrarecon.h',
     '<(libvpx_source)/vp8/common/swapyv12buffer.c',
@@ -65,6 +65,8 @@
     '<(libvpx_source)/vp8/common/variance.h',
     '<(libvpx_source)/vp8/common/variance_c.c',
     '<(libvpx_source)/vp8/common/vp8_entropymodedata.h',
+    '<(libvpx_source)/vp8/common/x86/copy_sse2.asm',
+    '<(libvpx_source)/vp8/common/x86/copy_sse3.asm',
     '<(libvpx_source)/vp8/common/x86/dequantize_mmx.asm',
     '<(libvpx_source)/vp8/common/x86/filter_x86.c',
     '<(libvpx_source)/vp8/common/x86/filter_x86.h',
@@ -80,11 +82,6 @@
     '<(libvpx_source)/vp8/common/x86/postproc_sse2.asm',
     '<(libvpx_source)/vp8/common/x86/recon_mmx.asm',
     '<(libvpx_source)/vp8/common/x86/recon_sse2.asm',
-    '<(libvpx_source)/vp8/common/x86/sad_mmx.asm',
-    '<(libvpx_source)/vp8/common/x86/sad_sse2.asm',
-    '<(libvpx_source)/vp8/common/x86/sad_sse3.asm',
-    '<(libvpx_source)/vp8/common/x86/sad_sse4.asm',
-    '<(libvpx_source)/vp8/common/x86/sad_ssse3.asm',
     '<(libvpx_source)/vp8/common/x86/subpixel_mmx.asm',
     '<(libvpx_source)/vp8/common/x86/subpixel_sse2.asm',
     '<(libvpx_source)/vp8/common/x86/subpixel_ssse3.asm',
@@ -299,7 +296,6 @@
     '<(libvpx_source)/vp9/encoder/vp9_rdopt.h',
     '<(libvpx_source)/vp9/encoder/vp9_resize.c',
     '<(libvpx_source)/vp9/encoder/vp9_resize.h',
-    '<(libvpx_source)/vp9/encoder/vp9_sad.c',
     '<(libvpx_source)/vp9/encoder/vp9_segmentation.c',
     '<(libvpx_source)/vp9/encoder/vp9_segmentation.h',
     '<(libvpx_source)/vp9/encoder/vp9_skin_detection.c',
@@ -325,11 +321,6 @@
     '<(libvpx_source)/vp9/encoder/x86/vp9_dct_mmx.asm',
     '<(libvpx_source)/vp9/encoder/x86/vp9_dct_sse2.h',
     '<(libvpx_source)/vp9/encoder/x86/vp9_error_sse2.asm',
-    '<(libvpx_source)/vp9/encoder/x86/vp9_sad4d_sse2.asm',
-    '<(libvpx_source)/vp9/encoder/x86/vp9_sad_sse2.asm',
-    '<(libvpx_source)/vp9/encoder/x86/vp9_sad_sse3.asm',
-    '<(libvpx_source)/vp9/encoder/x86/vp9_sad_sse4.asm',
-    '<(libvpx_source)/vp9/encoder/x86/vp9_sad_ssse3.asm',
     '<(libvpx_source)/vp9/encoder/x86/vp9_subpel_variance.asm',
     '<(libvpx_source)/vp9/encoder/x86/vp9_subtract_sse2.asm',
     '<(libvpx_source)/vp9/encoder/x86/vp9_temporal_filter_apply_sse2.asm',
@@ -352,6 +343,14 @@
     '<(libvpx_source)/vpx/vpx_frame_buffer.h',
     '<(libvpx_source)/vpx/vpx_image.h',
     '<(libvpx_source)/vpx/vpx_integer.h',
+    '<(libvpx_source)/vpx_dsp/sad.c',
+    '<(libvpx_source)/vpx_dsp/vpx_dsp_rtcd.c',
+    '<(libvpx_source)/vpx_dsp/x86/sad4d_sse2.asm',
+    '<(libvpx_source)/vpx_dsp/x86/sad_mmx.asm',
+    '<(libvpx_source)/vpx_dsp/x86/sad_sse2.asm',
+    '<(libvpx_source)/vpx_dsp/x86/sad_sse3.asm',
+    '<(libvpx_source)/vpx_dsp/x86/sad_sse4.asm',
+    '<(libvpx_source)/vpx_dsp/x86/sad_ssse3.asm',
     '<(libvpx_source)/vpx_mem/include/vpx_mem_intrnl.h',
     '<(libvpx_source)/vpx_mem/vpx_mem.c',
     '<(libvpx_source)/vpx_mem/vpx_mem.h',