| Index: libvpx_srcs.gni
 | 
| ===================================================================
 | 
| --- libvpx_srcs.gni	(revision 291857)
 | 
| +++ libvpx_srcs.gni	(working copy)
 | 
| @@ -347,7 +347,6 @@
 | 
|    "//third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_dct_mmx.asm",
 | 
|    "//third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_error_sse2.asm",
 | 
|    "//third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_sad4d_sse2.asm",
 | 
| -  "//third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_sad_mmx.asm",
 | 
|    "//third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_sad_sse2.asm",
 | 
|    "//third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_sad_sse3.asm",
 | 
|    "//third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_sad_sse4.asm",
 | 
| @@ -355,8 +354,6 @@
 | 
|    "//third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_subpel_variance.asm",
 | 
|    "//third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_subtract_sse2.asm",
 | 
|    "//third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_temporal_filter_apply_sse2.asm",
 | 
| -  "//third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_variance_impl_mmx.asm",
 | 
| -  "//third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_variance_impl_sse2.asm",
 | 
|    "//third_party/libvpx/source/libvpx/vpx_ports/emms.asm",
 | 
|    "//third_party/libvpx/source/libvpx/vpx_ports/x86_abi_support.asm",
 | 
|  ]
 | 
| @@ -364,7 +361,6 @@
 | 
|    "//third_party/libvpx/source/libvpx/vp8/common/x86/idct_blk_mmx.c",
 | 
|    "//third_party/libvpx/source/libvpx/vp8/common/x86/variance_mmx.c",
 | 
|    "//third_party/libvpx/source/libvpx/vp8/encoder/x86/vp8_enc_stubs_mmx.c",
 | 
| -  "//third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_variance_mmx.c",
 | 
|  ]
 | 
|  libvpx_srcs_x86_sse2 = [
 | 
|    "//third_party/libvpx/source/libvpx/vp8/common/x86/idct_blk_sse2.c",
 | 
| @@ -743,7 +739,6 @@
 | 
|    "//third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_error_sse2.asm",
 | 
|    "//third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_quantize_ssse3_x86_64.asm",
 | 
|    "//third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_sad4d_sse2.asm",
 | 
| -  "//third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_sad_mmx.asm",
 | 
|    "//third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_sad_sse2.asm",
 | 
|    "//third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_sad_sse3.asm",
 | 
|    "//third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_sad_sse4.asm",
 | 
| @@ -752,8 +747,6 @@
 | 
|    "//third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_subpel_variance.asm",
 | 
|    "//third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_subtract_sse2.asm",
 | 
|    "//third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_temporal_filter_apply_sse2.asm",
 | 
| -  "//third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_variance_impl_mmx.asm",
 | 
| -  "//third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_variance_impl_sse2.asm",
 | 
|    "//third_party/libvpx/source/libvpx/vpx_ports/emms.asm",
 | 
|    "//third_party/libvpx/source/libvpx/vpx_ports/x86_abi_support.asm",
 | 
|  ]
 | 
| @@ -761,7 +754,6 @@
 | 
|    "//third_party/libvpx/source/libvpx/vp8/common/x86/idct_blk_mmx.c",
 | 
|    "//third_party/libvpx/source/libvpx/vp8/common/x86/variance_mmx.c",
 | 
|    "//third_party/libvpx/source/libvpx/vp8/encoder/x86/vp8_enc_stubs_mmx.c",
 | 
| -  "//third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_variance_mmx.c",
 | 
|  ]
 | 
|  libvpx_srcs_x86_64_sse2 = [
 | 
|    "//third_party/libvpx/source/libvpx/vp8/common/x86/idct_blk_sse2.c",
 | 
| @@ -1157,20 +1149,19 @@
 | 
|    "//third_party/libvpx/source/libvpx/vp8/common/arm/neon/dequant_idct_neon.c",
 | 
|    "//third_party/libvpx/source/libvpx/vp8/common/arm/neon/dequantizeb_neon.c",
 | 
|    "//third_party/libvpx/source/libvpx/vp8/common/arm/neon/idct_blk_neon.c",
 | 
| -  "//third_party/libvpx/source/libvpx/vp8/common/arm/neon/idct_dequant_0_2x_neon.asm",
 | 
| -  "//third_party/libvpx/source/libvpx/vp8/common/arm/neon/idct_dequant_full_2x_neon.asm",
 | 
| +  "//third_party/libvpx/source/libvpx/vp8/common/arm/neon/idct_dequant_0_2x_neon.c",
 | 
| +  "//third_party/libvpx/source/libvpx/vp8/common/arm/neon/idct_dequant_full_2x_neon.c",
 | 
|    "//third_party/libvpx/source/libvpx/vp8/common/arm/neon/iwalsh_neon.c",
 | 
| -  "//third_party/libvpx/source/libvpx/vp8/common/arm/neon/loopfilter_neon.asm",
 | 
| +  "//third_party/libvpx/source/libvpx/vp8/common/arm/neon/loopfilter_neon.c",
 | 
|    "//third_party/libvpx/source/libvpx/vp8/common/arm/neon/loopfiltersimplehorizontaledge_neon.c",
 | 
| -  "//third_party/libvpx/source/libvpx/vp8/common/arm/neon/loopfiltersimpleverticaledge_neon.asm",
 | 
| +  "//third_party/libvpx/source/libvpx/vp8/common/arm/neon/loopfiltersimpleverticaledge_neon.c",
 | 
|    "//third_party/libvpx/source/libvpx/vp8/common/arm/neon/mbloopfilter_neon.c",
 | 
| +  "//third_party/libvpx/source/libvpx/vp8/common/arm/neon/reconintra_neon.c",
 | 
|    "//third_party/libvpx/source/libvpx/vp8/common/arm/neon/sad_neon.c",
 | 
|    "//third_party/libvpx/source/libvpx/vp8/common/arm/neon/shortidct4x4llm_neon.c",
 | 
|    "//third_party/libvpx/source/libvpx/vp8/common/arm/neon/sixtappredict_neon.c",
 | 
|    "//third_party/libvpx/source/libvpx/vp8/common/arm/neon/variance_neon.c",
 | 
| -  "//third_party/libvpx/source/libvpx/vp8/common/arm/neon/vp8_subpixelvariance16x16_neon.asm",
 | 
| -  "//third_party/libvpx/source/libvpx/vp8/common/arm/neon/vp8_subpixelvariance16x16s_neon.asm",
 | 
| -  "//third_party/libvpx/source/libvpx/vp8/common/arm/neon/vp8_subpixelvariance8x8_neon.asm",
 | 
| +  "//third_party/libvpx/source/libvpx/vp8/common/arm/neon/vp8_subpixelvariance_neon.c",
 | 
|    "//third_party/libvpx/source/libvpx/vp8/common/arm/variance_arm.c",
 | 
|    "//third_party/libvpx/source/libvpx/vp8/common/blockd.c",
 | 
|    "//third_party/libvpx/source/libvpx/vp8/common/blockd.h",
 | 
| @@ -1250,10 +1241,8 @@
 | 
|    "//third_party/libvpx/source/libvpx/vp8/encoder/arm/dct_arm.c",
 | 
|    "//third_party/libvpx/source/libvpx/vp8/encoder/arm/neon/denoising_neon.c",
 | 
|    "//third_party/libvpx/source/libvpx/vp8/encoder/arm/neon/fastquantizeb_neon.asm",
 | 
| -  "//third_party/libvpx/source/libvpx/vp8/encoder/arm/neon/picklpf_arm.c",
 | 
| -  "//third_party/libvpx/source/libvpx/vp8/encoder/arm/neon/shortfdct_neon.asm",
 | 
| +  "//third_party/libvpx/source/libvpx/vp8/encoder/arm/neon/shortfdct_neon.c",
 | 
|    "//third_party/libvpx/source/libvpx/vp8/encoder/arm/neon/subtract_neon.c",
 | 
| -  "//third_party/libvpx/source/libvpx/vp8/encoder/arm/neon/vp8_memcpy_neon.asm",
 | 
|    "//third_party/libvpx/source/libvpx/vp8/encoder/arm/neon/vp8_mse16x16_neon.asm",
 | 
|    "//third_party/libvpx/source/libvpx/vp8/encoder/arm/neon/vp8_shortwalsh4x4_neon.c",
 | 
|    "//third_party/libvpx/source/libvpx/vp8/encoder/arm/quantize_arm.c",
 | 
| @@ -1538,13 +1527,6 @@
 | 
|    "//third_party/libvpx/source/libvpx/vp8/common/arm/dequantize_arm.c",
 | 
|    "//third_party/libvpx/source/libvpx/vp8/common/arm/filter_arm.c",
 | 
|    "//third_party/libvpx/source/libvpx/vp8/common/arm/loopfilter_arm.c",
 | 
| -  "//third_party/libvpx/source/libvpx/vp8/common/arm/neon/idct_dequant_0_2x_neon.asm",
 | 
| -  "//third_party/libvpx/source/libvpx/vp8/common/arm/neon/idct_dequant_full_2x_neon.asm",
 | 
| -  "//third_party/libvpx/source/libvpx/vp8/common/arm/neon/loopfilter_neon.asm",
 | 
| -  "//third_party/libvpx/source/libvpx/vp8/common/arm/neon/loopfiltersimpleverticaledge_neon.asm",
 | 
| -  "//third_party/libvpx/source/libvpx/vp8/common/arm/neon/vp8_subpixelvariance16x16_neon.asm",
 | 
| -  "//third_party/libvpx/source/libvpx/vp8/common/arm/neon/vp8_subpixelvariance16x16s_neon.asm",
 | 
| -  "//third_party/libvpx/source/libvpx/vp8/common/arm/neon/vp8_subpixelvariance8x8_neon.asm",
 | 
|    "//third_party/libvpx/source/libvpx/vp8/common/arm/variance_arm.c",
 | 
|    "//third_party/libvpx/source/libvpx/vp8/common/blockd.c",
 | 
|    "//third_party/libvpx/source/libvpx/vp8/common/blockd.h",
 | 
| @@ -1623,9 +1605,6 @@
 | 
|    "//third_party/libvpx/source/libvpx/vp8/encoder/arm/armv6/walsh_v6.asm",
 | 
|    "//third_party/libvpx/source/libvpx/vp8/encoder/arm/dct_arm.c",
 | 
|    "//third_party/libvpx/source/libvpx/vp8/encoder/arm/neon/fastquantizeb_neon.asm",
 | 
| -  "//third_party/libvpx/source/libvpx/vp8/encoder/arm/neon/picklpf_arm.c",
 | 
| -  "//third_party/libvpx/source/libvpx/vp8/encoder/arm/neon/shortfdct_neon.asm",
 | 
| -  "//third_party/libvpx/source/libvpx/vp8/encoder/arm/neon/vp8_memcpy_neon.asm",
 | 
|    "//third_party/libvpx/source/libvpx/vp8/encoder/arm/neon/vp8_mse16x16_neon.asm",
 | 
|    "//third_party/libvpx/source/libvpx/vp8/encoder/arm/quantize_arm.c",
 | 
|    "//third_party/libvpx/source/libvpx/vp8/encoder/bitstream.c",
 | 
| @@ -1879,14 +1858,21 @@
 | 
|    "//third_party/libvpx/source/libvpx/vp8/common/arm/neon/dequant_idct_neon.c",
 | 
|    "//third_party/libvpx/source/libvpx/vp8/common/arm/neon/dequantizeb_neon.c",
 | 
|    "//third_party/libvpx/source/libvpx/vp8/common/arm/neon/idct_blk_neon.c",
 | 
| +  "//third_party/libvpx/source/libvpx/vp8/common/arm/neon/idct_dequant_0_2x_neon.c",
 | 
| +  "//third_party/libvpx/source/libvpx/vp8/common/arm/neon/idct_dequant_full_2x_neon.c",
 | 
|    "//third_party/libvpx/source/libvpx/vp8/common/arm/neon/iwalsh_neon.c",
 | 
| +  "//third_party/libvpx/source/libvpx/vp8/common/arm/neon/loopfilter_neon.c",
 | 
|    "//third_party/libvpx/source/libvpx/vp8/common/arm/neon/loopfiltersimplehorizontaledge_neon.c",
 | 
| +  "//third_party/libvpx/source/libvpx/vp8/common/arm/neon/loopfiltersimpleverticaledge_neon.c",
 | 
|    "//third_party/libvpx/source/libvpx/vp8/common/arm/neon/mbloopfilter_neon.c",
 | 
| +  "//third_party/libvpx/source/libvpx/vp8/common/arm/neon/reconintra_neon.c",
 | 
|    "//third_party/libvpx/source/libvpx/vp8/common/arm/neon/sad_neon.c",
 | 
|    "//third_party/libvpx/source/libvpx/vp8/common/arm/neon/shortidct4x4llm_neon.c",
 | 
|    "//third_party/libvpx/source/libvpx/vp8/common/arm/neon/sixtappredict_neon.c",
 | 
|    "//third_party/libvpx/source/libvpx/vp8/common/arm/neon/variance_neon.c",
 | 
| +  "//third_party/libvpx/source/libvpx/vp8/common/arm/neon/vp8_subpixelvariance_neon.c",
 | 
|    "//third_party/libvpx/source/libvpx/vp8/encoder/arm/neon/denoising_neon.c",
 | 
| +  "//third_party/libvpx/source/libvpx/vp8/encoder/arm/neon/shortfdct_neon.c",
 | 
|    "//third_party/libvpx/source/libvpx/vp8/encoder/arm/neon/subtract_neon.c",
 | 
|    "//third_party/libvpx/source/libvpx/vp8/encoder/arm/neon/vp8_shortwalsh4x4_neon.c",
 | 
|    "//third_party/libvpx/source/libvpx/vp9/common/arm/neon/vp9_convolve_neon.c",
 | 
| @@ -1909,13 +1895,20 @@
 | 
|    "//third_party/libvpx/source/libvpx/vp8/common/arm/neon/dc_only_idct_add_neon.c",
 | 
|    "//third_party/libvpx/source/libvpx/vp8/common/arm/neon/dequant_idct_neon.c",
 | 
|    "//third_party/libvpx/source/libvpx/vp8/common/arm/neon/dequantizeb_neon.c",
 | 
| +  "//third_party/libvpx/source/libvpx/vp8/common/arm/neon/idct_blk_neon.c",
 | 
| +  "//third_party/libvpx/source/libvpx/vp8/common/arm/neon/idct_dequant_0_2x_neon.c",
 | 
| +  "//third_party/libvpx/source/libvpx/vp8/common/arm/neon/idct_dequant_full_2x_neon.c",
 | 
|    "//third_party/libvpx/source/libvpx/vp8/common/arm/neon/iwalsh_neon.c",
 | 
| +  "//third_party/libvpx/source/libvpx/vp8/common/arm/neon/loopfilter_neon.c",
 | 
|    "//third_party/libvpx/source/libvpx/vp8/common/arm/neon/loopfiltersimplehorizontaledge_neon.c",
 | 
| +  "//third_party/libvpx/source/libvpx/vp8/common/arm/neon/loopfiltersimpleverticaledge_neon.c",
 | 
|    "//third_party/libvpx/source/libvpx/vp8/common/arm/neon/mbloopfilter_neon.c",
 | 
| +  "//third_party/libvpx/source/libvpx/vp8/common/arm/neon/reconintra_neon.c",
 | 
|    "//third_party/libvpx/source/libvpx/vp8/common/arm/neon/sad_neon.c",
 | 
|    "//third_party/libvpx/source/libvpx/vp8/common/arm/neon/shortidct4x4llm_neon.c",
 | 
|    "//third_party/libvpx/source/libvpx/vp8/common/arm/neon/sixtappredict_neon.c",
 | 
|    "//third_party/libvpx/source/libvpx/vp8/common/arm/neon/variance_neon.c",
 | 
| +  "//third_party/libvpx/source/libvpx/vp8/common/arm/neon/vp8_subpixelvariance_neon.c",
 | 
|    "//third_party/libvpx/source/libvpx/vp8/common/arm/variance_arm.c",
 | 
|    "//third_party/libvpx/source/libvpx/vp8/common/blockd.c",
 | 
|    "//third_party/libvpx/source/libvpx/vp8/common/blockd.h",
 | 
| @@ -1989,6 +1982,7 @@
 | 
|    "//third_party/libvpx/source/libvpx/vp8/decoder/treereader.h",
 | 
|    "//third_party/libvpx/source/libvpx/vp8/encoder/arm/dct_arm.c",
 | 
|    "//third_party/libvpx/source/libvpx/vp8/encoder/arm/neon/denoising_neon.c",
 | 
| +  "//third_party/libvpx/source/libvpx/vp8/encoder/arm/neon/shortfdct_neon.c",
 | 
|    "//third_party/libvpx/source/libvpx/vp8/encoder/arm/neon/subtract_neon.c",
 | 
|    "//third_party/libvpx/source/libvpx/vp8/encoder/arm/neon/vp8_shortwalsh4x4_neon.c",
 | 
|    "//third_party/libvpx/source/libvpx/vp8/encoder/arm/quantize_arm.c",
 | 
| 
 |