From 73814961a26db77b66bcf21b40443bec7ca8a11d Mon Sep 17 00:00:00 2001
From: "andrew@webrtc.org"
 <andrew@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>
Date: Fri, 16 Nov 2012 17:32:00 +0000
Subject: [PATCH] Add a variable for the libvpx path.

Review URL: https://webrtc-codereview.appspot.com/967007

git-svn-id: http://webrtc.googlecode.com/svn/trunk@3119 4adac7df-926f-26a2-2b94-8c16560cd09d
---
 third_party/libvpx/generate_gypi.sh          |   2 +-
 third_party/libvpx/libvpx.gyp                |  63 +--
 third_party/libvpx/libvpx_srcs_arm.gypi      | 336 ++++++-------
 third_party/libvpx/libvpx_srcs_arm_neon.gypi | 478 +++++++++----------
 third_party/libvpx/libvpx_srcs_x86.gypi      | 412 ++++++++--------
 third_party/libvpx/libvpx_srcs_x86_64.gypi   | 416 ++++++++--------
 6 files changed, 854 insertions(+), 853 deletions(-)

diff --git a/third_party/libvpx/generate_gypi.sh b/third_party/libvpx/generate_gypi.sh
index 56c9c4d4c..dabdad8a7 100755
--- a/third_party/libvpx/generate_gypi.sh
+++ b/third_party/libvpx/generate_gypi.sh
@@ -41,7 +41,7 @@ function convert_srcs_to_gypi {
   echo "  'sources': [" >> $2
   for f in $source_list
   do
-    echo "    '$LIBVPX_SRC_DIR/$f'," >> $2
+    echo "    '<(libvpx_src_dir)/$f'," >> $2
   done
   echo "  ]," >> $2
   echo "}" >> $2
diff --git a/third_party/libvpx/libvpx.gyp b/third_party/libvpx/libvpx.gyp
index ca3cfa7fb..2537ed531 100644
--- a/third_party/libvpx/libvpx.gyp
+++ b/third_party/libvpx/libvpx.gyp
@@ -3,6 +3,7 @@
 # found in the LICENSE file.
 {
   'variables': {
+    'libvpx_src_dir%': 'source/libvpx',
     'conditions': [
       ['os_posix==1', {
         'asm_obj_extension': 'o',
@@ -53,13 +54,13 @@
           'type': 'static_library',
           'include_dirs': [
             'source/config/<(OS)/<(target_arch)',
-            'source/libvpx',
-            'source/libvpx/vp8/common',
-            'source/libvpx/vp8/decoder',
-            'source/libvpx/vp8/encoder',
+            '<(libvpx_src_dir)',
+            '<(libvpx_src_dir)/vp8/common',
+            '<(libvpx_src_dir)/vp8/decoder',
+            '<(libvpx_src_dir)/vp8/encoder',
           ],
           'sources': [
-            'source/libvpx/vp8/encoder/x86/denoising_sse2.c',
+            '<(libvpx_src_dir)/vp8/encoder/x86/denoising_sse2.c',
           ],
           'conditions': [
             ['os_posix==1 and OS!="mac"', {
@@ -87,7 +88,7 @@
             'yasm_flags': [
               '-D', 'CHROMIUM',
               '-I', 'source/config/<(OS_CATEGORY)/<(target_arch)',
-              '-I', 'source/libvpx',
+              '-I', '<(libvpx_src_dir)',
               '-I', '<(shared_generated_dir)', # Generated assembly offsets
             ],
           },
@@ -99,15 +100,15 @@
           ],
           'include_dirs': [
             'source/config/<(OS_CATEGORY)/<(target_arch)',
-            'source/libvpx',
-            'source/libvpx/vp8/common',
-            'source/libvpx/vp8/decoder',
-            'source/libvpx/vp8/encoder',
+            '<(libvpx_src_dir)',
+            '<(libvpx_src_dir)/vp8/common',
+            '<(libvpx_src_dir)/vp8/decoder',
+            '<(libvpx_src_dir)/vp8/encoder',
             '<(shared_generated_dir)', # Provides vpx_rtcd.h.
           ],
           'direct_dependent_settings': {
             'include_dirs': [
-              'source/libvpx',
+              '<(libvpx_src_dir)',
             ],
           },
           # VS2010 does not correctly incrementally link obj files generated
@@ -144,9 +145,9 @@
             [ 'chromeos == 1', {
               # ChromeOS needs these files for animated WebM avatars.
               'sources': [
-                'source/libvpx/libmkv/EbmlIDs.h',
-                'source/libvpx/libmkv/EbmlWriter.c',
-                'source/libvpx/libmkv/EbmlWriter.h',
+                '<(libvpx_src_dir)/libmkv/EbmlIDs.h',
+                '<(libvpx_src_dir)/libmkv/EbmlWriter.c',
+                '<(libvpx_src_dir)/libmkv/EbmlWriter.h',
               ],
             }],
           ],
@@ -197,7 +198,7 @@
           'variables': {
             # Location of the assembly conversion script.
             'ads2gas_script': 'ads2gas.pl',
-            'ads2gas_script_path': 'source/libvpx/build/make/<(ads2gas_script)',
+            'ads2gas_script_path': '<(libvpx_src_dir)/build/make/<(ads2gas_script)',
           },
           'cflags': [
             # We need to explicitly tell the GCC assembler to look for
@@ -208,11 +209,11 @@
           ],
           'include_dirs': [
             'source/config/<(OS_CATEGORY)/<(target_arch_full)',
-            'source/libvpx',
+            '<(libvpx_src_dir)',
           ],
           'direct_dependent_settings': {
             'include_dirs': [
-              'source/libvpx',
+              '<(libvpx_src_dir)',
             ],
           },
           'conditions': [
@@ -242,9 +243,9 @@
             [ 'chromeos == 1', {
               # ChromeOS needs these files for animated WebM avatars.
               'sources': [
-                'source/libvpx/libmkv/EbmlIDs.h',
-                'source/libvpx/libmkv/EbmlWriter.c',
-                'source/libvpx/libmkv/EbmlWriter.h',
+                '<(libvpx_src_dir)/libmkv/EbmlIDs.h',
+                '<(libvpx_src_dir)/libmkv/EbmlWriter.c',
+                '<(libvpx_src_dir)/libmkv/EbmlWriter.h',
               ],
             }],
           ],
@@ -260,10 +261,10 @@
       'toolsets': ['host'],
       'include_dirs': [
         'source/config/<(OS_CATEGORY)/<(target_arch_full)',
-        'source/libvpx',
+        '<(libvpx_src_dir)',
       ],
       'sources': [
-        'source/libvpx/build/make/obj_int_extract.c',
+        '<(libvpx_src_dir)/build/make/obj_int_extract.c',
       ]
     },
     {
@@ -273,7 +274,7 @@
       'hard_dependency': 1,
       'include_dirs': [
         'source/config/<(OS_CATEGORY)/<(target_arch_full)',
-        'source/libvpx',
+        '<(libvpx_src_dir)',
       ],
       'conditions': [
         ['asan==1', {
@@ -286,9 +287,9 @@
       ],
       'sources': [
         '<(shared_generated_dir)/vpx_rtcd.h',
-        'source/libvpx/vp8/common/asm_com_offsets.c',
-        'source/libvpx/vp8/decoder/asm_dec_offsets.c',
-        'source/libvpx/vp8/encoder/asm_enc_offsets.c',
+        '<(libvpx_src_dir)/vp8/common/asm_com_offsets.c',
+        '<(libvpx_src_dir)/vp8/decoder/asm_dec_offsets.c',
+        '<(libvpx_src_dir)/vp8/encoder/asm_enc_offsets.c',
       ],
     },
     {
@@ -306,7 +307,7 @@
       'conditions': [
         ['OS=="win"', {
           'variables': {
-            'ninja_obj_dir': '<(PRODUCT_DIR)/obj/third_party/libvpx/source/libvpx/vp8',
+            'ninja_obj_dir': '<(PRODUCT_DIR)/obj/third_party/libvpx/<(libvpx_src_dir)/vp8',
           },
           'actions': [
             {
@@ -428,7 +429,7 @@
       'copies': [{
         'destination': '<(shared_generated_dir)/simple_encoder',
         'files': [
-          'source/libvpx/examples/gen_example_code.sh',
+          '<(libvpx_src_dir)/examples/gen_example_code.sh',
         ],
       }],
 
@@ -451,7 +452,7 @@
         },
       ],
       'sources': [
-        'source/libvpx/examples/simple_encoder.txt',
+        '<(libvpx_src_dir)/examples/simple_encoder.txt',
       ]
     },
     {
@@ -466,7 +467,7 @@
       'copies': [{
         'destination': '<(shared_generated_dir)/simple_decoder',
         'files': [
-          'source/libvpx/examples/gen_example_code.sh',
+          '<(libvpx_src_dir)/examples/gen_example_code.sh',
         ],
       }],
 
@@ -489,7 +490,7 @@
         },
       ],
       'sources': [
-        'source/libvpx/examples/simple_decoder.txt',
+        '<(libvpx_src_dir)/examples/simple_decoder.txt',
       ]
     },
   ],
diff --git a/third_party/libvpx/libvpx_srcs_arm.gypi b/third_party/libvpx/libvpx_srcs_arm.gypi
index 3fc2c41c9..20d03c0b3 100644
--- a/third_party/libvpx/libvpx_srcs_arm.gypi
+++ b/third_party/libvpx/libvpx_srcs_arm.gypi
@@ -5,173 +5,173 @@
 
 {
   'sources': [
-    'source/libvpx/vp8/common/alloccommon.c',
-    'source/libvpx/vp8/common/alloccommon.h',
-    'source/libvpx/vp8/common/arm/dequantize_arm.c',
-    'source/libvpx/vp8/common/arm/filter_arm.c',
-    'source/libvpx/vp8/common/arm/loopfilter_arm.c',
-    'source/libvpx/vp8/common/arm/reconintra_arm.c',
-    'source/libvpx/vp8/common/arm/variance_arm.c',
-    'source/libvpx/vp8/common/blockd.c',
-    'source/libvpx/vp8/common/blockd.h',
-    'source/libvpx/vp8/common/coefupdateprobs.h',
-    'source/libvpx/vp8/common/common.h',
-    'source/libvpx/vp8/common/debugmodes.c',
-    'source/libvpx/vp8/common/default_coef_probs.h',
-    'source/libvpx/vp8/common/dequantize.c',
-    'source/libvpx/vp8/common/entropy.c',
-    'source/libvpx/vp8/common/entropy.h',
-    'source/libvpx/vp8/common/entropymode.c',
-    'source/libvpx/vp8/common/entropymode.h',
-    'source/libvpx/vp8/common/entropymv.c',
-    'source/libvpx/vp8/common/entropymv.h',
-    'source/libvpx/vp8/common/extend.c',
-    'source/libvpx/vp8/common/extend.h',
-    'source/libvpx/vp8/common/filter.c',
-    'source/libvpx/vp8/common/filter.h',
-    'source/libvpx/vp8/common/findnearmv.c',
-    'source/libvpx/vp8/common/findnearmv.h',
-    'source/libvpx/vp8/common/generic/systemdependent.c',
-    'source/libvpx/vp8/common/header.h',
-    'source/libvpx/vp8/common/idct_blk.c',
-    'source/libvpx/vp8/common/idctllm.c',
-    'source/libvpx/vp8/common/invtrans.h',
-    'source/libvpx/vp8/common/loopfilter.c',
-    'source/libvpx/vp8/common/loopfilter_filters.c',
-    'source/libvpx/vp8/common/loopfilter.h',
-    'source/libvpx/vp8/common/mbpitch.c',
-    'source/libvpx/vp8/common/mfqe.c',
-    'source/libvpx/vp8/common/modecont.c',
-    'source/libvpx/vp8/common/modecont.h',
-    'source/libvpx/vp8/common/mv.h',
-    'source/libvpx/vp8/common/onyxc_int.h',
-    'source/libvpx/vp8/common/onyxd.h',
-    'source/libvpx/vp8/common/onyx.h',
-    'source/libvpx/vp8/common/postproc.c',
-    'source/libvpx/vp8/common/postproc.h',
-    'source/libvpx/vp8/common/ppflags.h',
-    'source/libvpx/vp8/common/pragmas.h',
-    'source/libvpx/vp8/common/quant_common.c',
-    'source/libvpx/vp8/common/quant_common.h',
-    'source/libvpx/vp8/common/reconinter.c',
-    'source/libvpx/vp8/common/reconinter.h',
-    'source/libvpx/vp8/common/reconintra4x4.c',
-    'source/libvpx/vp8/common/reconintra4x4.h',
-    'source/libvpx/vp8/common/reconintra.c',
-    'source/libvpx/vp8/common/rtcd.c',
-    'source/libvpx/vp8/common/sad_c.c',
-    'source/libvpx/vp8/common/setupintrarecon.c',
-    'source/libvpx/vp8/common/setupintrarecon.h',
-    'source/libvpx/vp8/common/swapyv12buffer.c',
-    'source/libvpx/vp8/common/swapyv12buffer.h',
-    'source/libvpx/vp8/common/systemdependent.h',
-    'source/libvpx/vp8/common/threading.h',
-    'source/libvpx/vp8/common/treecoder.c',
-    'source/libvpx/vp8/common/treecoder.h',
-    'source/libvpx/vp8/common/variance_c.c',
-    'source/libvpx/vp8/common/variance.h',
-    'source/libvpx/vp8/common/vp8_entropymodedata.h',
-    'source/libvpx/vp8/decoder/dboolhuff.c',
-    'source/libvpx/vp8/decoder/dboolhuff.h',
-    'source/libvpx/vp8/decoder/decodemv.c',
-    'source/libvpx/vp8/decoder/decodemv.h',
-    'source/libvpx/vp8/decoder/decoderthreading.h',
-    'source/libvpx/vp8/decoder/decodframe.c',
-    'source/libvpx/vp8/decoder/detokenize.c',
-    'source/libvpx/vp8/decoder/detokenize.h',
-    'source/libvpx/vp8/decoder/ec_types.h',
-    'source/libvpx/vp8/decoder/error_concealment.c',
-    'source/libvpx/vp8/decoder/error_concealment.h',
-    'source/libvpx/vp8/decoder/onyxd_if.c',
-    'source/libvpx/vp8/decoder/onyxd_int.h',
-    'source/libvpx/vp8/decoder/threading.c',
-    'source/libvpx/vp8/decoder/treereader.h',
-    'source/libvpx/vp8/encoder/arm/armv5te/boolhuff_armv5te.asm',
-    'source/libvpx/vp8/encoder/arm/armv5te/vp8_packtokens_armv5.asm',
-    'source/libvpx/vp8/encoder/arm/armv5te/vp8_packtokens_mbrow_armv5.asm',
-    'source/libvpx/vp8/encoder/arm/armv5te/vp8_packtokens_partitions_armv5.asm',
-    'source/libvpx/vp8/encoder/arm/boolhuff_arm.c',
-    'source/libvpx/vp8/encoder/arm/dct_arm.c',
-    'source/libvpx/vp8/encoder/arm/quantize_arm.c',
-    'source/libvpx/vp8/encoder/bitstream.c',
-    'source/libvpx/vp8/encoder/bitstream.h',
-    'source/libvpx/vp8/encoder/block.h',
-    'source/libvpx/vp8/encoder/boolhuff.h',
-    'source/libvpx/vp8/encoder/dct.c',
-    'source/libvpx/vp8/encoder/dct_value_cost.h',
-    'source/libvpx/vp8/encoder/dct_value_tokens.h',
-    'source/libvpx/vp8/encoder/defaultcoefcounts.h',
-    'source/libvpx/vp8/encoder/denoising.c',
-    'source/libvpx/vp8/encoder/denoising.h',
-    'source/libvpx/vp8/encoder/encodeframe.c',
-    'source/libvpx/vp8/encoder/encodeframe.h',
-    'source/libvpx/vp8/encoder/encodeintra.c',
-    'source/libvpx/vp8/encoder/encodeintra.h',
-    'source/libvpx/vp8/encoder/encodemb.c',
-    'source/libvpx/vp8/encoder/encodemb.h',
-    'source/libvpx/vp8/encoder/encodemv.c',
-    'source/libvpx/vp8/encoder/encodemv.h',
-    'source/libvpx/vp8/encoder/ethreading.c',
-    'source/libvpx/vp8/encoder/firstpass.h',
-    'source/libvpx/vp8/encoder/lookahead.c',
-    'source/libvpx/vp8/encoder/lookahead.h',
-    'source/libvpx/vp8/encoder/mcomp.c',
-    'source/libvpx/vp8/encoder/mcomp.h',
-    'source/libvpx/vp8/encoder/modecosts.c',
-    'source/libvpx/vp8/encoder/modecosts.h',
-    'source/libvpx/vp8/encoder/mr_dissim.c',
-    'source/libvpx/vp8/encoder/mr_dissim.h',
-    'source/libvpx/vp8/encoder/onyx_if.c',
-    'source/libvpx/vp8/encoder/onyx_int.h',
-    'source/libvpx/vp8/encoder/pickinter.c',
-    'source/libvpx/vp8/encoder/pickinter.h',
-    'source/libvpx/vp8/encoder/picklpf.c',
-    'source/libvpx/vp8/encoder/psnr.c',
-    'source/libvpx/vp8/encoder/psnr.h',
-    'source/libvpx/vp8/encoder/quantize.c',
-    'source/libvpx/vp8/encoder/quantize.h',
-    'source/libvpx/vp8/encoder/ratectrl.c',
-    'source/libvpx/vp8/encoder/ratectrl.h',
-    'source/libvpx/vp8/encoder/rdopt.c',
-    'source/libvpx/vp8/encoder/rdopt.h',
-    'source/libvpx/vp8/encoder/segmentation.c',
-    'source/libvpx/vp8/encoder/segmentation.h',
-    'source/libvpx/vp8/encoder/tokenize.c',
-    'source/libvpx/vp8/encoder/tokenize.h',
-    'source/libvpx/vp8/encoder/treewriter.c',
-    'source/libvpx/vp8/encoder/treewriter.h',
-    'source/libvpx/vp8/vp8_cx_iface.c',
-    'source/libvpx/vp8/vp8_dx_iface.c',
-    'source/libvpx/vpx/internal/vpx_codec_internal.h',
-    'source/libvpx/vpx_mem/include/vpx_mem_intrnl.h',
-    'source/libvpx/vpx_mem/vpx_mem.c',
-    'source/libvpx/vpx_mem/vpx_mem.h',
-    'source/libvpx/vpx_ports/arm_cpudetect.c',
-    'source/libvpx/vpx_ports/arm.h',
-    'source/libvpx/vpx_ports/asm_offsets.h',
-    'source/libvpx/vpx_ports/mem.h',
-    'source/libvpx/vpx_ports/vpx_timer.h',
-    'source/libvpx/vpx_scale/generic/gen_scalers.c',
-    'source/libvpx/vpx_scale/generic/vpxscale.c',
-    'source/libvpx/vpx_scale/generic/yv12config.c',
-    'source/libvpx/vpx_scale/generic/yv12extend.c',
-    'source/libvpx/vpx_scale/generic/yv12extend_generic.h',
-    'source/libvpx/vpx_scale/scale_mode.h',
-    'source/libvpx/vpx_scale/vpxscale.h',
-    'source/libvpx/vpx_scale/yv12config.h',
-    'source/libvpx/vpx/src/vpx_codec.c',
-    'source/libvpx/vpx/src/vpx_decoder.c',
-    'source/libvpx/vpx/src/vpx_encoder.c',
-    'source/libvpx/vpx/src/vpx_image.c',
-    'source/libvpx/vpx/vp8cx.h',
-    'source/libvpx/vpx/vp8dx.h',
-    'source/libvpx/vpx/vp8.h',
-    'source/libvpx/vpx/vpx_codec.h',
-    'source/libvpx/vpx/vpx_codec_impl_bottom.h',
-    'source/libvpx/vpx/vpx_codec_impl_top.h',
-    'source/libvpx/vpx/vpx_decoder.h',
-    'source/libvpx/vpx/vpx_encoder.h',
-    'source/libvpx/vpx/vpx_image.h',
-    'source/libvpx/vpx/vpx_integer.h',
+    '<(libvpx_src_dir)/vp8/common/alloccommon.c',
+    '<(libvpx_src_dir)/vp8/common/alloccommon.h',
+    '<(libvpx_src_dir)/vp8/common/arm/dequantize_arm.c',
+    '<(libvpx_src_dir)/vp8/common/arm/filter_arm.c',
+    '<(libvpx_src_dir)/vp8/common/arm/loopfilter_arm.c',
+    '<(libvpx_src_dir)/vp8/common/arm/reconintra_arm.c',
+    '<(libvpx_src_dir)/vp8/common/arm/variance_arm.c',
+    '<(libvpx_src_dir)/vp8/common/blockd.c',
+    '<(libvpx_src_dir)/vp8/common/blockd.h',
+    '<(libvpx_src_dir)/vp8/common/coefupdateprobs.h',
+    '<(libvpx_src_dir)/vp8/common/common.h',
+    '<(libvpx_src_dir)/vp8/common/debugmodes.c',
+    '<(libvpx_src_dir)/vp8/common/default_coef_probs.h',
+    '<(libvpx_src_dir)/vp8/common/dequantize.c',
+    '<(libvpx_src_dir)/vp8/common/entropy.c',
+    '<(libvpx_src_dir)/vp8/common/entropy.h',
+    '<(libvpx_src_dir)/vp8/common/entropymode.c',
+    '<(libvpx_src_dir)/vp8/common/entropymode.h',
+    '<(libvpx_src_dir)/vp8/common/entropymv.c',
+    '<(libvpx_src_dir)/vp8/common/entropymv.h',
+    '<(libvpx_src_dir)/vp8/common/extend.c',
+    '<(libvpx_src_dir)/vp8/common/extend.h',
+    '<(libvpx_src_dir)/vp8/common/filter.c',
+    '<(libvpx_src_dir)/vp8/common/filter.h',
+    '<(libvpx_src_dir)/vp8/common/findnearmv.c',
+    '<(libvpx_src_dir)/vp8/common/findnearmv.h',
+    '<(libvpx_src_dir)/vp8/common/generic/systemdependent.c',
+    '<(libvpx_src_dir)/vp8/common/header.h',
+    '<(libvpx_src_dir)/vp8/common/idct_blk.c',
+    '<(libvpx_src_dir)/vp8/common/idctllm.c',
+    '<(libvpx_src_dir)/vp8/common/invtrans.h',
+    '<(libvpx_src_dir)/vp8/common/loopfilter.c',
+    '<(libvpx_src_dir)/vp8/common/loopfilter_filters.c',
+    '<(libvpx_src_dir)/vp8/common/loopfilter.h',
+    '<(libvpx_src_dir)/vp8/common/mbpitch.c',
+    '<(libvpx_src_dir)/vp8/common/mfqe.c',
+    '<(libvpx_src_dir)/vp8/common/modecont.c',
+    '<(libvpx_src_dir)/vp8/common/modecont.h',
+    '<(libvpx_src_dir)/vp8/common/mv.h',
+    '<(libvpx_src_dir)/vp8/common/onyxc_int.h',
+    '<(libvpx_src_dir)/vp8/common/onyxd.h',
+    '<(libvpx_src_dir)/vp8/common/onyx.h',
+    '<(libvpx_src_dir)/vp8/common/postproc.c',
+    '<(libvpx_src_dir)/vp8/common/postproc.h',
+    '<(libvpx_src_dir)/vp8/common/ppflags.h',
+    '<(libvpx_src_dir)/vp8/common/pragmas.h',
+    '<(libvpx_src_dir)/vp8/common/quant_common.c',
+    '<(libvpx_src_dir)/vp8/common/quant_common.h',
+    '<(libvpx_src_dir)/vp8/common/reconinter.c',
+    '<(libvpx_src_dir)/vp8/common/reconinter.h',
+    '<(libvpx_src_dir)/vp8/common/reconintra4x4.c',
+    '<(libvpx_src_dir)/vp8/common/reconintra4x4.h',
+    '<(libvpx_src_dir)/vp8/common/reconintra.c',
+    '<(libvpx_src_dir)/vp8/common/rtcd.c',
+    '<(libvpx_src_dir)/vp8/common/sad_c.c',
+    '<(libvpx_src_dir)/vp8/common/setupintrarecon.c',
+    '<(libvpx_src_dir)/vp8/common/setupintrarecon.h',
+    '<(libvpx_src_dir)/vp8/common/swapyv12buffer.c',
+    '<(libvpx_src_dir)/vp8/common/swapyv12buffer.h',
+    '<(libvpx_src_dir)/vp8/common/systemdependent.h',
+    '<(libvpx_src_dir)/vp8/common/threading.h',
+    '<(libvpx_src_dir)/vp8/common/treecoder.c',
+    '<(libvpx_src_dir)/vp8/common/treecoder.h',
+    '<(libvpx_src_dir)/vp8/common/variance_c.c',
+    '<(libvpx_src_dir)/vp8/common/variance.h',
+    '<(libvpx_src_dir)/vp8/common/vp8_entropymodedata.h',
+    '<(libvpx_src_dir)/vp8/decoder/dboolhuff.c',
+    '<(libvpx_src_dir)/vp8/decoder/dboolhuff.h',
+    '<(libvpx_src_dir)/vp8/decoder/decodemv.c',
+    '<(libvpx_src_dir)/vp8/decoder/decodemv.h',
+    '<(libvpx_src_dir)/vp8/decoder/decoderthreading.h',
+    '<(libvpx_src_dir)/vp8/decoder/decodframe.c',
+    '<(libvpx_src_dir)/vp8/decoder/detokenize.c',
+    '<(libvpx_src_dir)/vp8/decoder/detokenize.h',
+    '<(libvpx_src_dir)/vp8/decoder/ec_types.h',
+    '<(libvpx_src_dir)/vp8/decoder/error_concealment.c',
+    '<(libvpx_src_dir)/vp8/decoder/error_concealment.h',
+    '<(libvpx_src_dir)/vp8/decoder/onyxd_if.c',
+    '<(libvpx_src_dir)/vp8/decoder/onyxd_int.h',
+    '<(libvpx_src_dir)/vp8/decoder/threading.c',
+    '<(libvpx_src_dir)/vp8/decoder/treereader.h',
+    '<(libvpx_src_dir)/vp8/encoder/arm/armv5te/boolhuff_armv5te.asm',
+    '<(libvpx_src_dir)/vp8/encoder/arm/armv5te/vp8_packtokens_armv5.asm',
+    '<(libvpx_src_dir)/vp8/encoder/arm/armv5te/vp8_packtokens_mbrow_armv5.asm',
+    '<(libvpx_src_dir)/vp8/encoder/arm/armv5te/vp8_packtokens_partitions_armv5.asm',
+    '<(libvpx_src_dir)/vp8/encoder/arm/boolhuff_arm.c',
+    '<(libvpx_src_dir)/vp8/encoder/arm/dct_arm.c',
+    '<(libvpx_src_dir)/vp8/encoder/arm/quantize_arm.c',
+    '<(libvpx_src_dir)/vp8/encoder/bitstream.c',
+    '<(libvpx_src_dir)/vp8/encoder/bitstream.h',
+    '<(libvpx_src_dir)/vp8/encoder/block.h',
+    '<(libvpx_src_dir)/vp8/encoder/boolhuff.h',
+    '<(libvpx_src_dir)/vp8/encoder/dct.c',
+    '<(libvpx_src_dir)/vp8/encoder/dct_value_cost.h',
+    '<(libvpx_src_dir)/vp8/encoder/dct_value_tokens.h',
+    '<(libvpx_src_dir)/vp8/encoder/defaultcoefcounts.h',
+    '<(libvpx_src_dir)/vp8/encoder/denoising.c',
+    '<(libvpx_src_dir)/vp8/encoder/denoising.h',
+    '<(libvpx_src_dir)/vp8/encoder/encodeframe.c',
+    '<(libvpx_src_dir)/vp8/encoder/encodeframe.h',
+    '<(libvpx_src_dir)/vp8/encoder/encodeintra.c',
+    '<(libvpx_src_dir)/vp8/encoder/encodeintra.h',
+    '<(libvpx_src_dir)/vp8/encoder/encodemb.c',
+    '<(libvpx_src_dir)/vp8/encoder/encodemb.h',
+    '<(libvpx_src_dir)/vp8/encoder/encodemv.c',
+    '<(libvpx_src_dir)/vp8/encoder/encodemv.h',
+    '<(libvpx_src_dir)/vp8/encoder/ethreading.c',
+    '<(libvpx_src_dir)/vp8/encoder/firstpass.h',
+    '<(libvpx_src_dir)/vp8/encoder/lookahead.c',
+    '<(libvpx_src_dir)/vp8/encoder/lookahead.h',
+    '<(libvpx_src_dir)/vp8/encoder/mcomp.c',
+    '<(libvpx_src_dir)/vp8/encoder/mcomp.h',
+    '<(libvpx_src_dir)/vp8/encoder/modecosts.c',
+    '<(libvpx_src_dir)/vp8/encoder/modecosts.h',
+    '<(libvpx_src_dir)/vp8/encoder/mr_dissim.c',
+    '<(libvpx_src_dir)/vp8/encoder/mr_dissim.h',
+    '<(libvpx_src_dir)/vp8/encoder/onyx_if.c',
+    '<(libvpx_src_dir)/vp8/encoder/onyx_int.h',
+    '<(libvpx_src_dir)/vp8/encoder/pickinter.c',
+    '<(libvpx_src_dir)/vp8/encoder/pickinter.h',
+    '<(libvpx_src_dir)/vp8/encoder/picklpf.c',
+    '<(libvpx_src_dir)/vp8/encoder/psnr.c',
+    '<(libvpx_src_dir)/vp8/encoder/psnr.h',
+    '<(libvpx_src_dir)/vp8/encoder/quantize.c',
+    '<(libvpx_src_dir)/vp8/encoder/quantize.h',
+    '<(libvpx_src_dir)/vp8/encoder/ratectrl.c',
+    '<(libvpx_src_dir)/vp8/encoder/ratectrl.h',
+    '<(libvpx_src_dir)/vp8/encoder/rdopt.c',
+    '<(libvpx_src_dir)/vp8/encoder/rdopt.h',
+    '<(libvpx_src_dir)/vp8/encoder/segmentation.c',
+    '<(libvpx_src_dir)/vp8/encoder/segmentation.h',
+    '<(libvpx_src_dir)/vp8/encoder/tokenize.c',
+    '<(libvpx_src_dir)/vp8/encoder/tokenize.h',
+    '<(libvpx_src_dir)/vp8/encoder/treewriter.c',
+    '<(libvpx_src_dir)/vp8/encoder/treewriter.h',
+    '<(libvpx_src_dir)/vp8/vp8_cx_iface.c',
+    '<(libvpx_src_dir)/vp8/vp8_dx_iface.c',
+    '<(libvpx_src_dir)/vpx/internal/vpx_codec_internal.h',
+    '<(libvpx_src_dir)/vpx_mem/include/vpx_mem_intrnl.h',
+    '<(libvpx_src_dir)/vpx_mem/vpx_mem.c',
+    '<(libvpx_src_dir)/vpx_mem/vpx_mem.h',
+    '<(libvpx_src_dir)/vpx_ports/arm_cpudetect.c',
+    '<(libvpx_src_dir)/vpx_ports/arm.h',
+    '<(libvpx_src_dir)/vpx_ports/asm_offsets.h',
+    '<(libvpx_src_dir)/vpx_ports/mem.h',
+    '<(libvpx_src_dir)/vpx_ports/vpx_timer.h',
+    '<(libvpx_src_dir)/vpx_scale/generic/gen_scalers.c',
+    '<(libvpx_src_dir)/vpx_scale/generic/vpxscale.c',
+    '<(libvpx_src_dir)/vpx_scale/generic/yv12config.c',
+    '<(libvpx_src_dir)/vpx_scale/generic/yv12extend.c',
+    '<(libvpx_src_dir)/vpx_scale/generic/yv12extend_generic.h',
+    '<(libvpx_src_dir)/vpx_scale/scale_mode.h',
+    '<(libvpx_src_dir)/vpx_scale/vpxscale.h',
+    '<(libvpx_src_dir)/vpx_scale/yv12config.h',
+    '<(libvpx_src_dir)/vpx/src/vpx_codec.c',
+    '<(libvpx_src_dir)/vpx/src/vpx_decoder.c',
+    '<(libvpx_src_dir)/vpx/src/vpx_encoder.c',
+    '<(libvpx_src_dir)/vpx/src/vpx_image.c',
+    '<(libvpx_src_dir)/vpx/vp8cx.h',
+    '<(libvpx_src_dir)/vpx/vp8dx.h',
+    '<(libvpx_src_dir)/vpx/vp8.h',
+    '<(libvpx_src_dir)/vpx/vpx_codec.h',
+    '<(libvpx_src_dir)/vpx/vpx_codec_impl_bottom.h',
+    '<(libvpx_src_dir)/vpx/vpx_codec_impl_top.h',
+    '<(libvpx_src_dir)/vpx/vpx_decoder.h',
+    '<(libvpx_src_dir)/vpx/vpx_encoder.h',
+    '<(libvpx_src_dir)/vpx/vpx_image.h',
+    '<(libvpx_src_dir)/vpx/vpx_integer.h',
   ],
 }
diff --git a/third_party/libvpx/libvpx_srcs_arm_neon.gypi b/third_party/libvpx/libvpx_srcs_arm_neon.gypi
index 1d5174f58..4fc96408d 100644
--- a/third_party/libvpx/libvpx_srcs_arm_neon.gypi
+++ b/third_party/libvpx/libvpx_srcs_arm_neon.gypi
@@ -5,244 +5,244 @@
 
 {
   'sources': [
-    'source/libvpx/vp8/common/alloccommon.c',
-    'source/libvpx/vp8/common/alloccommon.h',
-    'source/libvpx/vp8/common/arm/armv6/bilinearfilter_v6.asm',
-    'source/libvpx/vp8/common/arm/armv6/copymem16x16_v6.asm',
-    'source/libvpx/vp8/common/arm/armv6/copymem8x4_v6.asm',
-    'source/libvpx/vp8/common/arm/armv6/copymem8x8_v6.asm',
-    'source/libvpx/vp8/common/arm/armv6/dc_only_idct_add_v6.asm',
-    'source/libvpx/vp8/common/arm/armv6/dequant_idct_v6.asm',
-    'source/libvpx/vp8/common/arm/armv6/dequantize_v6.asm',
-    'source/libvpx/vp8/common/arm/armv6/filter_v6.asm',
-    'source/libvpx/vp8/common/arm/armv6/idct_blk_v6.c',
-    'source/libvpx/vp8/common/arm/armv6/idct_v6.asm',
-    'source/libvpx/vp8/common/arm/armv6/intra4x4_predict_v6.asm',
-    'source/libvpx/vp8/common/arm/armv6/iwalsh_v6.asm',
-    'source/libvpx/vp8/common/arm/armv6/loopfilter_v6.asm',
-    'source/libvpx/vp8/common/arm/armv6/simpleloopfilter_v6.asm',
-    'source/libvpx/vp8/common/arm/armv6/sixtappredict8x4_v6.asm',
-    'source/libvpx/vp8/common/arm/armv6/vp8_sad16x16_armv6.asm',
-    'source/libvpx/vp8/common/arm/armv6/vp8_variance16x16_armv6.asm',
-    'source/libvpx/vp8/common/arm/armv6/vp8_variance8x8_armv6.asm',
-    'source/libvpx/vp8/common/arm/armv6/vp8_variance_halfpixvar16x16_h_armv6.asm',
-    'source/libvpx/vp8/common/arm/armv6/vp8_variance_halfpixvar16x16_hv_armv6.asm',
-    'source/libvpx/vp8/common/arm/armv6/vp8_variance_halfpixvar16x16_v_armv6.asm',
-    'source/libvpx/vp8/common/arm/bilinearfilter_arm.c',
-    'source/libvpx/vp8/common/arm/bilinearfilter_arm.h',
-    'source/libvpx/vp8/common/arm/dequantize_arm.c',
-    'source/libvpx/vp8/common/arm/filter_arm.c',
-    'source/libvpx/vp8/common/arm/loopfilter_arm.c',
-    'source/libvpx/vp8/common/arm/neon/bilinearpredict16x16_neon.asm',
-    'source/libvpx/vp8/common/arm/neon/bilinearpredict4x4_neon.asm',
-    'source/libvpx/vp8/common/arm/neon/bilinearpredict8x4_neon.asm',
-    'source/libvpx/vp8/common/arm/neon/bilinearpredict8x8_neon.asm',
-    'source/libvpx/vp8/common/arm/neon/buildintrapredictorsmby_neon.asm',
-    'source/libvpx/vp8/common/arm/neon/copymem16x16_neon.asm',
-    'source/libvpx/vp8/common/arm/neon/copymem8x4_neon.asm',
-    'source/libvpx/vp8/common/arm/neon/copymem8x8_neon.asm',
-    'source/libvpx/vp8/common/arm/neon/dc_only_idct_add_neon.asm',
-    'source/libvpx/vp8/common/arm/neon/dequant_idct_neon.asm',
-    'source/libvpx/vp8/common/arm/neon/dequantizeb_neon.asm',
-    'source/libvpx/vp8/common/arm/neon/idct_blk_neon.c',
-    'source/libvpx/vp8/common/arm/neon/idct_dequant_0_2x_neon.asm',
-    'source/libvpx/vp8/common/arm/neon/idct_dequant_full_2x_neon.asm',
-    'source/libvpx/vp8/common/arm/neon/iwalsh_neon.asm',
-    'source/libvpx/vp8/common/arm/neon/loopfilter_neon.asm',
-    'source/libvpx/vp8/common/arm/neon/loopfiltersimplehorizontaledge_neon.asm',
-    'source/libvpx/vp8/common/arm/neon/loopfiltersimpleverticaledge_neon.asm',
-    'source/libvpx/vp8/common/arm/neon/mbloopfilter_neon.asm',
-    'source/libvpx/vp8/common/arm/neon/sad16_neon.asm',
-    'source/libvpx/vp8/common/arm/neon/sad8_neon.asm',
-    'source/libvpx/vp8/common/arm/neon/save_reg_neon.asm',
-    'source/libvpx/vp8/common/arm/neon/shortidct4x4llm_neon.asm',
-    'source/libvpx/vp8/common/arm/neon/sixtappredict16x16_neon.asm',
-    'source/libvpx/vp8/common/arm/neon/sixtappredict4x4_neon.asm',
-    'source/libvpx/vp8/common/arm/neon/sixtappredict8x4_neon.asm',
-    'source/libvpx/vp8/common/arm/neon/sixtappredict8x8_neon.asm',
-    'source/libvpx/vp8/common/arm/neon/variance_neon.asm',
-    'source/libvpx/vp8/common/arm/neon/vp8_subpixelvariance16x16_neon.asm',
-    'source/libvpx/vp8/common/arm/neon/vp8_subpixelvariance16x16s_neon.asm',
-    'source/libvpx/vp8/common/arm/neon/vp8_subpixelvariance8x8_neon.asm',
-    'source/libvpx/vp8/common/arm/reconintra_arm.c',
-    'source/libvpx/vp8/common/arm/variance_arm.c',
-    'source/libvpx/vp8/common/blockd.c',
-    'source/libvpx/vp8/common/blockd.h',
-    'source/libvpx/vp8/common/coefupdateprobs.h',
-    'source/libvpx/vp8/common/common.h',
-    'source/libvpx/vp8/common/debugmodes.c',
-    'source/libvpx/vp8/common/default_coef_probs.h',
-    'source/libvpx/vp8/common/dequantize.c',
-    'source/libvpx/vp8/common/entropy.c',
-    'source/libvpx/vp8/common/entropy.h',
-    'source/libvpx/vp8/common/entropymode.c',
-    'source/libvpx/vp8/common/entropymode.h',
-    'source/libvpx/vp8/common/entropymv.c',
-    'source/libvpx/vp8/common/entropymv.h',
-    'source/libvpx/vp8/common/extend.c',
-    'source/libvpx/vp8/common/extend.h',
-    'source/libvpx/vp8/common/filter.c',
-    'source/libvpx/vp8/common/filter.h',
-    'source/libvpx/vp8/common/findnearmv.c',
-    'source/libvpx/vp8/common/findnearmv.h',
-    'source/libvpx/vp8/common/generic/systemdependent.c',
-    'source/libvpx/vp8/common/header.h',
-    'source/libvpx/vp8/common/idct_blk.c',
-    'source/libvpx/vp8/common/idctllm.c',
-    'source/libvpx/vp8/common/invtrans.h',
-    'source/libvpx/vp8/common/loopfilter.c',
-    'source/libvpx/vp8/common/loopfilter_filters.c',
-    'source/libvpx/vp8/common/loopfilter.h',
-    'source/libvpx/vp8/common/mbpitch.c',
-    'source/libvpx/vp8/common/mfqe.c',
-    'source/libvpx/vp8/common/modecont.c',
-    'source/libvpx/vp8/common/modecont.h',
-    'source/libvpx/vp8/common/mv.h',
-    'source/libvpx/vp8/common/onyxc_int.h',
-    'source/libvpx/vp8/common/onyxd.h',
-    'source/libvpx/vp8/common/onyx.h',
-    'source/libvpx/vp8/common/postproc.c',
-    'source/libvpx/vp8/common/postproc.h',
-    'source/libvpx/vp8/common/ppflags.h',
-    'source/libvpx/vp8/common/pragmas.h',
-    'source/libvpx/vp8/common/quant_common.c',
-    'source/libvpx/vp8/common/quant_common.h',
-    'source/libvpx/vp8/common/reconinter.c',
-    'source/libvpx/vp8/common/reconinter.h',
-    'source/libvpx/vp8/common/reconintra4x4.c',
-    'source/libvpx/vp8/common/reconintra4x4.h',
-    'source/libvpx/vp8/common/reconintra.c',
-    'source/libvpx/vp8/common/rtcd.c',
-    'source/libvpx/vp8/common/sad_c.c',
-    'source/libvpx/vp8/common/setupintrarecon.c',
-    'source/libvpx/vp8/common/setupintrarecon.h',
-    'source/libvpx/vp8/common/swapyv12buffer.c',
-    'source/libvpx/vp8/common/swapyv12buffer.h',
-    'source/libvpx/vp8/common/systemdependent.h',
-    'source/libvpx/vp8/common/threading.h',
-    'source/libvpx/vp8/common/treecoder.c',
-    'source/libvpx/vp8/common/treecoder.h',
-    'source/libvpx/vp8/common/variance_c.c',
-    'source/libvpx/vp8/common/variance.h',
-    'source/libvpx/vp8/common/vp8_entropymodedata.h',
-    'source/libvpx/vp8/decoder/dboolhuff.c',
-    'source/libvpx/vp8/decoder/dboolhuff.h',
-    'source/libvpx/vp8/decoder/decodemv.c',
-    'source/libvpx/vp8/decoder/decodemv.h',
-    'source/libvpx/vp8/decoder/decoderthreading.h',
-    'source/libvpx/vp8/decoder/decodframe.c',
-    'source/libvpx/vp8/decoder/detokenize.c',
-    'source/libvpx/vp8/decoder/detokenize.h',
-    'source/libvpx/vp8/decoder/ec_types.h',
-    'source/libvpx/vp8/decoder/error_concealment.c',
-    'source/libvpx/vp8/decoder/error_concealment.h',
-    'source/libvpx/vp8/decoder/onyxd_if.c',
-    'source/libvpx/vp8/decoder/onyxd_int.h',
-    'source/libvpx/vp8/decoder/threading.c',
-    'source/libvpx/vp8/decoder/treereader.h',
-    'source/libvpx/vp8/encoder/arm/armv5te/boolhuff_armv5te.asm',
-    'source/libvpx/vp8/encoder/arm/armv5te/vp8_packtokens_armv5.asm',
-    'source/libvpx/vp8/encoder/arm/armv5te/vp8_packtokens_mbrow_armv5.asm',
-    'source/libvpx/vp8/encoder/arm/armv5te/vp8_packtokens_partitions_armv5.asm',
-    'source/libvpx/vp8/encoder/arm/armv6/vp8_fast_quantize_b_armv6.asm',
-    'source/libvpx/vp8/encoder/arm/armv6/vp8_mse16x16_armv6.asm',
-    'source/libvpx/vp8/encoder/arm/armv6/vp8_short_fdct4x4_armv6.asm',
-    'source/libvpx/vp8/encoder/arm/armv6/vp8_subtract_armv6.asm',
-    'source/libvpx/vp8/encoder/arm/armv6/walsh_v6.asm',
-    'source/libvpx/vp8/encoder/arm/boolhuff_arm.c',
-    'source/libvpx/vp8/encoder/arm/dct_arm.c',
-    'source/libvpx/vp8/encoder/arm/neon/fastquantizeb_neon.asm',
-    'source/libvpx/vp8/encoder/arm/neon/picklpf_arm.c',
-    'source/libvpx/vp8/encoder/arm/neon/shortfdct_neon.asm',
-    'source/libvpx/vp8/encoder/arm/neon/subtract_neon.asm',
-    'source/libvpx/vp8/encoder/arm/neon/vp8_memcpy_neon.asm',
-    'source/libvpx/vp8/encoder/arm/neon/vp8_mse16x16_neon.asm',
-    'source/libvpx/vp8/encoder/arm/neon/vp8_shortwalsh4x4_neon.asm',
-    'source/libvpx/vp8/encoder/arm/quantize_arm.c',
-    'source/libvpx/vp8/encoder/bitstream.c',
-    'source/libvpx/vp8/encoder/bitstream.h',
-    'source/libvpx/vp8/encoder/block.h',
-    'source/libvpx/vp8/encoder/boolhuff.h',
-    'source/libvpx/vp8/encoder/dct.c',
-    'source/libvpx/vp8/encoder/dct_value_cost.h',
-    'source/libvpx/vp8/encoder/dct_value_tokens.h',
-    'source/libvpx/vp8/encoder/defaultcoefcounts.h',
-    'source/libvpx/vp8/encoder/denoising.c',
-    'source/libvpx/vp8/encoder/denoising.h',
-    'source/libvpx/vp8/encoder/encodeframe.c',
-    'source/libvpx/vp8/encoder/encodeframe.h',
-    'source/libvpx/vp8/encoder/encodeintra.c',
-    'source/libvpx/vp8/encoder/encodeintra.h',
-    'source/libvpx/vp8/encoder/encodemb.c',
-    'source/libvpx/vp8/encoder/encodemb.h',
-    'source/libvpx/vp8/encoder/encodemv.c',
-    'source/libvpx/vp8/encoder/encodemv.h',
-    'source/libvpx/vp8/encoder/ethreading.c',
-    'source/libvpx/vp8/encoder/firstpass.h',
-    'source/libvpx/vp8/encoder/lookahead.c',
-    'source/libvpx/vp8/encoder/lookahead.h',
-    'source/libvpx/vp8/encoder/mcomp.c',
-    'source/libvpx/vp8/encoder/mcomp.h',
-    'source/libvpx/vp8/encoder/modecosts.c',
-    'source/libvpx/vp8/encoder/modecosts.h',
-    'source/libvpx/vp8/encoder/mr_dissim.c',
-    'source/libvpx/vp8/encoder/mr_dissim.h',
-    'source/libvpx/vp8/encoder/onyx_if.c',
-    'source/libvpx/vp8/encoder/onyx_int.h',
-    'source/libvpx/vp8/encoder/pickinter.c',
-    'source/libvpx/vp8/encoder/pickinter.h',
-    'source/libvpx/vp8/encoder/picklpf.c',
-    'source/libvpx/vp8/encoder/psnr.c',
-    'source/libvpx/vp8/encoder/psnr.h',
-    'source/libvpx/vp8/encoder/quantize.c',
-    'source/libvpx/vp8/encoder/quantize.h',
-    'source/libvpx/vp8/encoder/ratectrl.c',
-    'source/libvpx/vp8/encoder/ratectrl.h',
-    'source/libvpx/vp8/encoder/rdopt.c',
-    'source/libvpx/vp8/encoder/rdopt.h',
-    'source/libvpx/vp8/encoder/segmentation.c',
-    'source/libvpx/vp8/encoder/segmentation.h',
-    'source/libvpx/vp8/encoder/tokenize.c',
-    'source/libvpx/vp8/encoder/tokenize.h',
-    'source/libvpx/vp8/encoder/treewriter.c',
-    'source/libvpx/vp8/encoder/treewriter.h',
-    'source/libvpx/vp8/vp8_cx_iface.c',
-    'source/libvpx/vp8/vp8_dx_iface.c',
-    'source/libvpx/vpx/internal/vpx_codec_internal.h',
-    'source/libvpx/vpx_mem/include/vpx_mem_intrnl.h',
-    'source/libvpx/vpx_mem/vpx_mem.c',
-    'source/libvpx/vpx_mem/vpx_mem.h',
-    'source/libvpx/vpx_ports/arm_cpudetect.c',
-    'source/libvpx/vpx_ports/arm.h',
-    'source/libvpx/vpx_ports/asm_offsets.h',
-    'source/libvpx/vpx_ports/mem.h',
-    'source/libvpx/vpx_ports/vpx_timer.h',
-    'source/libvpx/vpx_scale/arm/neon/vp8_vpxyv12_copyframe_func_neon.asm',
-    'source/libvpx/vpx_scale/arm/neon/vp8_vpxyv12_copysrcframe_func_neon.asm',
-    'source/libvpx/vpx_scale/arm/neon/vp8_vpxyv12_copy_y_neon.asm',
-    'source/libvpx/vpx_scale/arm/neon/vp8_vpxyv12_extendframeborders_neon.asm',
-    'source/libvpx/vpx_scale/arm/neon/yv12extend_arm.c',
-    'source/libvpx/vpx_scale/generic/gen_scalers.c',
-    'source/libvpx/vpx_scale/generic/vpxscale.c',
-    'source/libvpx/vpx_scale/generic/yv12config.c',
-    'source/libvpx/vpx_scale/generic/yv12extend.c',
-    'source/libvpx/vpx_scale/generic/yv12extend_generic.h',
-    'source/libvpx/vpx_scale/scale_mode.h',
-    'source/libvpx/vpx_scale/vpxscale.h',
-    'source/libvpx/vpx_scale/yv12config.h',
-    'source/libvpx/vpx/src/vpx_codec.c',
-    'source/libvpx/vpx/src/vpx_decoder.c',
-    'source/libvpx/vpx/src/vpx_encoder.c',
-    'source/libvpx/vpx/src/vpx_image.c',
-    'source/libvpx/vpx/vp8cx.h',
-    'source/libvpx/vpx/vp8dx.h',
-    'source/libvpx/vpx/vp8.h',
-    'source/libvpx/vpx/vpx_codec.h',
-    'source/libvpx/vpx/vpx_codec_impl_bottom.h',
-    'source/libvpx/vpx/vpx_codec_impl_top.h',
-    'source/libvpx/vpx/vpx_decoder.h',
-    'source/libvpx/vpx/vpx_encoder.h',
-    'source/libvpx/vpx/vpx_image.h',
-    'source/libvpx/vpx/vpx_integer.h',
+    '<(libvpx_src_dir)/vp8/common/alloccommon.c',
+    '<(libvpx_src_dir)/vp8/common/alloccommon.h',
+    '<(libvpx_src_dir)/vp8/common/arm/armv6/bilinearfilter_v6.asm',
+    '<(libvpx_src_dir)/vp8/common/arm/armv6/copymem16x16_v6.asm',
+    '<(libvpx_src_dir)/vp8/common/arm/armv6/copymem8x4_v6.asm',
+    '<(libvpx_src_dir)/vp8/common/arm/armv6/copymem8x8_v6.asm',
+    '<(libvpx_src_dir)/vp8/common/arm/armv6/dc_only_idct_add_v6.asm',
+    '<(libvpx_src_dir)/vp8/common/arm/armv6/dequant_idct_v6.asm',
+    '<(libvpx_src_dir)/vp8/common/arm/armv6/dequantize_v6.asm',
+    '<(libvpx_src_dir)/vp8/common/arm/armv6/filter_v6.asm',
+    '<(libvpx_src_dir)/vp8/common/arm/armv6/idct_blk_v6.c',
+    '<(libvpx_src_dir)/vp8/common/arm/armv6/idct_v6.asm',
+    '<(libvpx_src_dir)/vp8/common/arm/armv6/intra4x4_predict_v6.asm',
+    '<(libvpx_src_dir)/vp8/common/arm/armv6/iwalsh_v6.asm',
+    '<(libvpx_src_dir)/vp8/common/arm/armv6/loopfilter_v6.asm',
+    '<(libvpx_src_dir)/vp8/common/arm/armv6/simpleloopfilter_v6.asm',
+    '<(libvpx_src_dir)/vp8/common/arm/armv6/sixtappredict8x4_v6.asm',
+    '<(libvpx_src_dir)/vp8/common/arm/armv6/vp8_sad16x16_armv6.asm',
+    '<(libvpx_src_dir)/vp8/common/arm/armv6/vp8_variance16x16_armv6.asm',
+    '<(libvpx_src_dir)/vp8/common/arm/armv6/vp8_variance8x8_armv6.asm',
+    '<(libvpx_src_dir)/vp8/common/arm/armv6/vp8_variance_halfpixvar16x16_h_armv6.asm',
+    '<(libvpx_src_dir)/vp8/common/arm/armv6/vp8_variance_halfpixvar16x16_hv_armv6.asm',
+    '<(libvpx_src_dir)/vp8/common/arm/armv6/vp8_variance_halfpixvar16x16_v_armv6.asm',
+    '<(libvpx_src_dir)/vp8/common/arm/bilinearfilter_arm.c',
+    '<(libvpx_src_dir)/vp8/common/arm/bilinearfilter_arm.h',
+    '<(libvpx_src_dir)/vp8/common/arm/dequantize_arm.c',
+    '<(libvpx_src_dir)/vp8/common/arm/filter_arm.c',
+    '<(libvpx_src_dir)/vp8/common/arm/loopfilter_arm.c',
+    '<(libvpx_src_dir)/vp8/common/arm/neon/bilinearpredict16x16_neon.asm',
+    '<(libvpx_src_dir)/vp8/common/arm/neon/bilinearpredict4x4_neon.asm',
+    '<(libvpx_src_dir)/vp8/common/arm/neon/bilinearpredict8x4_neon.asm',
+    '<(libvpx_src_dir)/vp8/common/arm/neon/bilinearpredict8x8_neon.asm',
+    '<(libvpx_src_dir)/vp8/common/arm/neon/buildintrapredictorsmby_neon.asm',
+    '<(libvpx_src_dir)/vp8/common/arm/neon/copymem16x16_neon.asm',
+    '<(libvpx_src_dir)/vp8/common/arm/neon/copymem8x4_neon.asm',
+    '<(libvpx_src_dir)/vp8/common/arm/neon/copymem8x8_neon.asm',
+    '<(libvpx_src_dir)/vp8/common/arm/neon/dc_only_idct_add_neon.asm',
+    '<(libvpx_src_dir)/vp8/common/arm/neon/dequant_idct_neon.asm',
+    '<(libvpx_src_dir)/vp8/common/arm/neon/dequantizeb_neon.asm',
+    '<(libvpx_src_dir)/vp8/common/arm/neon/idct_blk_neon.c',
+    '<(libvpx_src_dir)/vp8/common/arm/neon/idct_dequant_0_2x_neon.asm',
+    '<(libvpx_src_dir)/vp8/common/arm/neon/idct_dequant_full_2x_neon.asm',
+    '<(libvpx_src_dir)/vp8/common/arm/neon/iwalsh_neon.asm',
+    '<(libvpx_src_dir)/vp8/common/arm/neon/loopfilter_neon.asm',
+    '<(libvpx_src_dir)/vp8/common/arm/neon/loopfiltersimplehorizontaledge_neon.asm',
+    '<(libvpx_src_dir)/vp8/common/arm/neon/loopfiltersimpleverticaledge_neon.asm',
+    '<(libvpx_src_dir)/vp8/common/arm/neon/mbloopfilter_neon.asm',
+    '<(libvpx_src_dir)/vp8/common/arm/neon/sad16_neon.asm',
+    '<(libvpx_src_dir)/vp8/common/arm/neon/sad8_neon.asm',
+    '<(libvpx_src_dir)/vp8/common/arm/neon/save_reg_neon.asm',
+    '<(libvpx_src_dir)/vp8/common/arm/neon/shortidct4x4llm_neon.asm',
+    '<(libvpx_src_dir)/vp8/common/arm/neon/sixtappredict16x16_neon.asm',
+    '<(libvpx_src_dir)/vp8/common/arm/neon/sixtappredict4x4_neon.asm',
+    '<(libvpx_src_dir)/vp8/common/arm/neon/sixtappredict8x4_neon.asm',
+    '<(libvpx_src_dir)/vp8/common/arm/neon/sixtappredict8x8_neon.asm',
+    '<(libvpx_src_dir)/vp8/common/arm/neon/variance_neon.asm',
+    '<(libvpx_src_dir)/vp8/common/arm/neon/vp8_subpixelvariance16x16_neon.asm',
+    '<(libvpx_src_dir)/vp8/common/arm/neon/vp8_subpixelvariance16x16s_neon.asm',
+    '<(libvpx_src_dir)/vp8/common/arm/neon/vp8_subpixelvariance8x8_neon.asm',
+    '<(libvpx_src_dir)/vp8/common/arm/reconintra_arm.c',
+    '<(libvpx_src_dir)/vp8/common/arm/variance_arm.c',
+    '<(libvpx_src_dir)/vp8/common/blockd.c',
+    '<(libvpx_src_dir)/vp8/common/blockd.h',
+    '<(libvpx_src_dir)/vp8/common/coefupdateprobs.h',
+    '<(libvpx_src_dir)/vp8/common/common.h',
+    '<(libvpx_src_dir)/vp8/common/debugmodes.c',
+    '<(libvpx_src_dir)/vp8/common/default_coef_probs.h',
+    '<(libvpx_src_dir)/vp8/common/dequantize.c',
+    '<(libvpx_src_dir)/vp8/common/entropy.c',
+    '<(libvpx_src_dir)/vp8/common/entropy.h',
+    '<(libvpx_src_dir)/vp8/common/entropymode.c',
+    '<(libvpx_src_dir)/vp8/common/entropymode.h',
+    '<(libvpx_src_dir)/vp8/common/entropymv.c',
+    '<(libvpx_src_dir)/vp8/common/entropymv.h',
+    '<(libvpx_src_dir)/vp8/common/extend.c',
+    '<(libvpx_src_dir)/vp8/common/extend.h',
+    '<(libvpx_src_dir)/vp8/common/filter.c',
+    '<(libvpx_src_dir)/vp8/common/filter.h',
+    '<(libvpx_src_dir)/vp8/common/findnearmv.c',
+    '<(libvpx_src_dir)/vp8/common/findnearmv.h',
+    '<(libvpx_src_dir)/vp8/common/generic/systemdependent.c',
+    '<(libvpx_src_dir)/vp8/common/header.h',
+    '<(libvpx_src_dir)/vp8/common/idct_blk.c',
+    '<(libvpx_src_dir)/vp8/common/idctllm.c',
+    '<(libvpx_src_dir)/vp8/common/invtrans.h',
+    '<(libvpx_src_dir)/vp8/common/loopfilter.c',
+    '<(libvpx_src_dir)/vp8/common/loopfilter_filters.c',
+    '<(libvpx_src_dir)/vp8/common/loopfilter.h',
+    '<(libvpx_src_dir)/vp8/common/mbpitch.c',
+    '<(libvpx_src_dir)/vp8/common/mfqe.c',
+    '<(libvpx_src_dir)/vp8/common/modecont.c',
+    '<(libvpx_src_dir)/vp8/common/modecont.h',
+    '<(libvpx_src_dir)/vp8/common/mv.h',
+    '<(libvpx_src_dir)/vp8/common/onyxc_int.h',
+    '<(libvpx_src_dir)/vp8/common/onyxd.h',
+    '<(libvpx_src_dir)/vp8/common/onyx.h',
+    '<(libvpx_src_dir)/vp8/common/postproc.c',
+    '<(libvpx_src_dir)/vp8/common/postproc.h',
+    '<(libvpx_src_dir)/vp8/common/ppflags.h',
+    '<(libvpx_src_dir)/vp8/common/pragmas.h',
+    '<(libvpx_src_dir)/vp8/common/quant_common.c',
+    '<(libvpx_src_dir)/vp8/common/quant_common.h',
+    '<(libvpx_src_dir)/vp8/common/reconinter.c',
+    '<(libvpx_src_dir)/vp8/common/reconinter.h',
+    '<(libvpx_src_dir)/vp8/common/reconintra4x4.c',
+    '<(libvpx_src_dir)/vp8/common/reconintra4x4.h',
+    '<(libvpx_src_dir)/vp8/common/reconintra.c',
+    '<(libvpx_src_dir)/vp8/common/rtcd.c',
+    '<(libvpx_src_dir)/vp8/common/sad_c.c',
+    '<(libvpx_src_dir)/vp8/common/setupintrarecon.c',
+    '<(libvpx_src_dir)/vp8/common/setupintrarecon.h',
+    '<(libvpx_src_dir)/vp8/common/swapyv12buffer.c',
+    '<(libvpx_src_dir)/vp8/common/swapyv12buffer.h',
+    '<(libvpx_src_dir)/vp8/common/systemdependent.h',
+    '<(libvpx_src_dir)/vp8/common/threading.h',
+    '<(libvpx_src_dir)/vp8/common/treecoder.c',
+    '<(libvpx_src_dir)/vp8/common/treecoder.h',
+    '<(libvpx_src_dir)/vp8/common/variance_c.c',
+    '<(libvpx_src_dir)/vp8/common/variance.h',
+    '<(libvpx_src_dir)/vp8/common/vp8_entropymodedata.h',
+    '<(libvpx_src_dir)/vp8/decoder/dboolhuff.c',
+    '<(libvpx_src_dir)/vp8/decoder/dboolhuff.h',
+    '<(libvpx_src_dir)/vp8/decoder/decodemv.c',
+    '<(libvpx_src_dir)/vp8/decoder/decodemv.h',
+    '<(libvpx_src_dir)/vp8/decoder/decoderthreading.h',
+    '<(libvpx_src_dir)/vp8/decoder/decodframe.c',
+    '<(libvpx_src_dir)/vp8/decoder/detokenize.c',
+    '<(libvpx_src_dir)/vp8/decoder/detokenize.h',
+    '<(libvpx_src_dir)/vp8/decoder/ec_types.h',
+    '<(libvpx_src_dir)/vp8/decoder/error_concealment.c',
+    '<(libvpx_src_dir)/vp8/decoder/error_concealment.h',
+    '<(libvpx_src_dir)/vp8/decoder/onyxd_if.c',
+    '<(libvpx_src_dir)/vp8/decoder/onyxd_int.h',
+    '<(libvpx_src_dir)/vp8/decoder/threading.c',
+    '<(libvpx_src_dir)/vp8/decoder/treereader.h',
+    '<(libvpx_src_dir)/vp8/encoder/arm/armv5te/boolhuff_armv5te.asm',
+    '<(libvpx_src_dir)/vp8/encoder/arm/armv5te/vp8_packtokens_armv5.asm',
+    '<(libvpx_src_dir)/vp8/encoder/arm/armv5te/vp8_packtokens_mbrow_armv5.asm',
+    '<(libvpx_src_dir)/vp8/encoder/arm/armv5te/vp8_packtokens_partitions_armv5.asm',
+    '<(libvpx_src_dir)/vp8/encoder/arm/armv6/vp8_fast_quantize_b_armv6.asm',
+    '<(libvpx_src_dir)/vp8/encoder/arm/armv6/vp8_mse16x16_armv6.asm',
+    '<(libvpx_src_dir)/vp8/encoder/arm/armv6/vp8_short_fdct4x4_armv6.asm',
+    '<(libvpx_src_dir)/vp8/encoder/arm/armv6/vp8_subtract_armv6.asm',
+    '<(libvpx_src_dir)/vp8/encoder/arm/armv6/walsh_v6.asm',
+    '<(libvpx_src_dir)/vp8/encoder/arm/boolhuff_arm.c',
+    '<(libvpx_src_dir)/vp8/encoder/arm/dct_arm.c',
+    '<(libvpx_src_dir)/vp8/encoder/arm/neon/fastquantizeb_neon.asm',
+    '<(libvpx_src_dir)/vp8/encoder/arm/neon/picklpf_arm.c',
+    '<(libvpx_src_dir)/vp8/encoder/arm/neon/shortfdct_neon.asm',
+    '<(libvpx_src_dir)/vp8/encoder/arm/neon/subtract_neon.asm',
+    '<(libvpx_src_dir)/vp8/encoder/arm/neon/vp8_memcpy_neon.asm',
+    '<(libvpx_src_dir)/vp8/encoder/arm/neon/vp8_mse16x16_neon.asm',
+    '<(libvpx_src_dir)/vp8/encoder/arm/neon/vp8_shortwalsh4x4_neon.asm',
+    '<(libvpx_src_dir)/vp8/encoder/arm/quantize_arm.c',
+    '<(libvpx_src_dir)/vp8/encoder/bitstream.c',
+    '<(libvpx_src_dir)/vp8/encoder/bitstream.h',
+    '<(libvpx_src_dir)/vp8/encoder/block.h',
+    '<(libvpx_src_dir)/vp8/encoder/boolhuff.h',
+    '<(libvpx_src_dir)/vp8/encoder/dct.c',
+    '<(libvpx_src_dir)/vp8/encoder/dct_value_cost.h',
+    '<(libvpx_src_dir)/vp8/encoder/dct_value_tokens.h',
+    '<(libvpx_src_dir)/vp8/encoder/defaultcoefcounts.h',
+    '<(libvpx_src_dir)/vp8/encoder/denoising.c',
+    '<(libvpx_src_dir)/vp8/encoder/denoising.h',
+    '<(libvpx_src_dir)/vp8/encoder/encodeframe.c',
+    '<(libvpx_src_dir)/vp8/encoder/encodeframe.h',
+    '<(libvpx_src_dir)/vp8/encoder/encodeintra.c',
+    '<(libvpx_src_dir)/vp8/encoder/encodeintra.h',
+    '<(libvpx_src_dir)/vp8/encoder/encodemb.c',
+    '<(libvpx_src_dir)/vp8/encoder/encodemb.h',
+    '<(libvpx_src_dir)/vp8/encoder/encodemv.c',
+    '<(libvpx_src_dir)/vp8/encoder/encodemv.h',
+    '<(libvpx_src_dir)/vp8/encoder/ethreading.c',
+    '<(libvpx_src_dir)/vp8/encoder/firstpass.h',
+    '<(libvpx_src_dir)/vp8/encoder/lookahead.c',
+    '<(libvpx_src_dir)/vp8/encoder/lookahead.h',
+    '<(libvpx_src_dir)/vp8/encoder/mcomp.c',
+    '<(libvpx_src_dir)/vp8/encoder/mcomp.h',
+    '<(libvpx_src_dir)/vp8/encoder/modecosts.c',
+    '<(libvpx_src_dir)/vp8/encoder/modecosts.h',
+    '<(libvpx_src_dir)/vp8/encoder/mr_dissim.c',
+    '<(libvpx_src_dir)/vp8/encoder/mr_dissim.h',
+    '<(libvpx_src_dir)/vp8/encoder/onyx_if.c',
+    '<(libvpx_src_dir)/vp8/encoder/onyx_int.h',
+    '<(libvpx_src_dir)/vp8/encoder/pickinter.c',
+    '<(libvpx_src_dir)/vp8/encoder/pickinter.h',
+    '<(libvpx_src_dir)/vp8/encoder/picklpf.c',
+    '<(libvpx_src_dir)/vp8/encoder/psnr.c',
+    '<(libvpx_src_dir)/vp8/encoder/psnr.h',
+    '<(libvpx_src_dir)/vp8/encoder/quantize.c',
+    '<(libvpx_src_dir)/vp8/encoder/quantize.h',
+    '<(libvpx_src_dir)/vp8/encoder/ratectrl.c',
+    '<(libvpx_src_dir)/vp8/encoder/ratectrl.h',
+    '<(libvpx_src_dir)/vp8/encoder/rdopt.c',
+    '<(libvpx_src_dir)/vp8/encoder/rdopt.h',
+    '<(libvpx_src_dir)/vp8/encoder/segmentation.c',
+    '<(libvpx_src_dir)/vp8/encoder/segmentation.h',
+    '<(libvpx_src_dir)/vp8/encoder/tokenize.c',
+    '<(libvpx_src_dir)/vp8/encoder/tokenize.h',
+    '<(libvpx_src_dir)/vp8/encoder/treewriter.c',
+    '<(libvpx_src_dir)/vp8/encoder/treewriter.h',
+    '<(libvpx_src_dir)/vp8/vp8_cx_iface.c',
+    '<(libvpx_src_dir)/vp8/vp8_dx_iface.c',
+    '<(libvpx_src_dir)/vpx/internal/vpx_codec_internal.h',
+    '<(libvpx_src_dir)/vpx_mem/include/vpx_mem_intrnl.h',
+    '<(libvpx_src_dir)/vpx_mem/vpx_mem.c',
+    '<(libvpx_src_dir)/vpx_mem/vpx_mem.h',
+    '<(libvpx_src_dir)/vpx_ports/arm_cpudetect.c',
+    '<(libvpx_src_dir)/vpx_ports/arm.h',
+    '<(libvpx_src_dir)/vpx_ports/asm_offsets.h',
+    '<(libvpx_src_dir)/vpx_ports/mem.h',
+    '<(libvpx_src_dir)/vpx_ports/vpx_timer.h',
+    '<(libvpx_src_dir)/vpx_scale/arm/neon/vp8_vpxyv12_copyframe_func_neon.asm',
+    '<(libvpx_src_dir)/vpx_scale/arm/neon/vp8_vpxyv12_copysrcframe_func_neon.asm',
+    '<(libvpx_src_dir)/vpx_scale/arm/neon/vp8_vpxyv12_copy_y_neon.asm',
+    '<(libvpx_src_dir)/vpx_scale/arm/neon/vp8_vpxyv12_extendframeborders_neon.asm',
+    '<(libvpx_src_dir)/vpx_scale/arm/neon/yv12extend_arm.c',
+    '<(libvpx_src_dir)/vpx_scale/generic/gen_scalers.c',
+    '<(libvpx_src_dir)/vpx_scale/generic/vpxscale.c',
+    '<(libvpx_src_dir)/vpx_scale/generic/yv12config.c',
+    '<(libvpx_src_dir)/vpx_scale/generic/yv12extend.c',
+    '<(libvpx_src_dir)/vpx_scale/generic/yv12extend_generic.h',
+    '<(libvpx_src_dir)/vpx_scale/scale_mode.h',
+    '<(libvpx_src_dir)/vpx_scale/vpxscale.h',
+    '<(libvpx_src_dir)/vpx_scale/yv12config.h',
+    '<(libvpx_src_dir)/vpx/src/vpx_codec.c',
+    '<(libvpx_src_dir)/vpx/src/vpx_decoder.c',
+    '<(libvpx_src_dir)/vpx/src/vpx_encoder.c',
+    '<(libvpx_src_dir)/vpx/src/vpx_image.c',
+    '<(libvpx_src_dir)/vpx/vp8cx.h',
+    '<(libvpx_src_dir)/vpx/vp8dx.h',
+    '<(libvpx_src_dir)/vpx/vp8.h',
+    '<(libvpx_src_dir)/vpx/vpx_codec.h',
+    '<(libvpx_src_dir)/vpx/vpx_codec_impl_bottom.h',
+    '<(libvpx_src_dir)/vpx/vpx_codec_impl_top.h',
+    '<(libvpx_src_dir)/vpx/vpx_decoder.h',
+    '<(libvpx_src_dir)/vpx/vpx_encoder.h',
+    '<(libvpx_src_dir)/vpx/vpx_image.h',
+    '<(libvpx_src_dir)/vpx/vpx_integer.h',
   ],
 }
diff --git a/third_party/libvpx/libvpx_srcs_x86.gypi b/third_party/libvpx/libvpx_srcs_x86.gypi
index f4737f423..d43abd5b9 100644
--- a/third_party/libvpx/libvpx_srcs_x86.gypi
+++ b/third_party/libvpx/libvpx_srcs_x86.gypi
@@ -5,212 +5,212 @@
 
 {
   'sources': [
-    'source/libvpx/vp8/common/alloccommon.c',
-    'source/libvpx/vp8/common/alloccommon.h',
-    'source/libvpx/vp8/common/blockd.c',
-    'source/libvpx/vp8/common/blockd.h',
-    'source/libvpx/vp8/common/coefupdateprobs.h',
-    'source/libvpx/vp8/common/common.h',
-    'source/libvpx/vp8/common/debugmodes.c',
-    'source/libvpx/vp8/common/default_coef_probs.h',
-    'source/libvpx/vp8/common/dequantize.c',
-    'source/libvpx/vp8/common/entropy.c',
-    'source/libvpx/vp8/common/entropy.h',
-    'source/libvpx/vp8/common/entropymode.c',
-    'source/libvpx/vp8/common/entropymode.h',
-    'source/libvpx/vp8/common/entropymv.c',
-    'source/libvpx/vp8/common/entropymv.h',
-    'source/libvpx/vp8/common/extend.c',
-    'source/libvpx/vp8/common/extend.h',
-    'source/libvpx/vp8/common/filter.c',
-    'source/libvpx/vp8/common/filter.h',
-    'source/libvpx/vp8/common/findnearmv.c',
-    'source/libvpx/vp8/common/findnearmv.h',
-    'source/libvpx/vp8/common/generic/systemdependent.c',
-    'source/libvpx/vp8/common/header.h',
-    'source/libvpx/vp8/common/idct_blk.c',
-    'source/libvpx/vp8/common/idctllm.c',
-    'source/libvpx/vp8/common/invtrans.h',
-    'source/libvpx/vp8/common/loopfilter.c',
-    'source/libvpx/vp8/common/loopfilter_filters.c',
-    'source/libvpx/vp8/common/loopfilter.h',
-    'source/libvpx/vp8/common/mbpitch.c',
-    'source/libvpx/vp8/common/mfqe.c',
-    'source/libvpx/vp8/common/modecont.c',
-    'source/libvpx/vp8/common/modecont.h',
-    'source/libvpx/vp8/common/mv.h',
-    'source/libvpx/vp8/common/onyxc_int.h',
-    'source/libvpx/vp8/common/onyxd.h',
-    'source/libvpx/vp8/common/onyx.h',
-    'source/libvpx/vp8/common/postproc.c',
-    'source/libvpx/vp8/common/postproc.h',
-    'source/libvpx/vp8/common/ppflags.h',
-    'source/libvpx/vp8/common/pragmas.h',
-    'source/libvpx/vp8/common/quant_common.c',
-    'source/libvpx/vp8/common/quant_common.h',
-    'source/libvpx/vp8/common/reconinter.c',
-    'source/libvpx/vp8/common/reconinter.h',
-    'source/libvpx/vp8/common/reconintra4x4.c',
-    'source/libvpx/vp8/common/reconintra4x4.h',
-    'source/libvpx/vp8/common/reconintra.c',
-    'source/libvpx/vp8/common/rtcd.c',
-    'source/libvpx/vp8/common/sad_c.c',
-    'source/libvpx/vp8/common/setupintrarecon.c',
-    'source/libvpx/vp8/common/setupintrarecon.h',
-    'source/libvpx/vp8/common/swapyv12buffer.c',
-    'source/libvpx/vp8/common/swapyv12buffer.h',
-    'source/libvpx/vp8/common/systemdependent.h',
-    'source/libvpx/vp8/common/threading.h',
-    'source/libvpx/vp8/common/treecoder.c',
-    'source/libvpx/vp8/common/treecoder.h',
-    'source/libvpx/vp8/common/variance_c.c',
-    'source/libvpx/vp8/common/variance.h',
-    'source/libvpx/vp8/common/vp8_entropymodedata.h',
-    'source/libvpx/vp8/common/x86/dequantize_mmx.asm',
-    'source/libvpx/vp8/common/x86/filter_x86.c',
-    'source/libvpx/vp8/common/x86/filter_x86.h',
-    'source/libvpx/vp8/common/x86/idct_blk_mmx.c',
-    'source/libvpx/vp8/common/x86/idct_blk_sse2.c',
-    'source/libvpx/vp8/common/x86/idctllm_mmx.asm',
-    'source/libvpx/vp8/common/x86/idctllm_sse2.asm',
-    'source/libvpx/vp8/common/x86/iwalsh_mmx.asm',
-    'source/libvpx/vp8/common/x86/iwalsh_sse2.asm',
-    'source/libvpx/vp8/common/x86/loopfilter_mmx.asm',
-    'source/libvpx/vp8/common/x86/loopfilter_sse2.asm',
-    'source/libvpx/vp8/common/x86/loopfilter_x86.c',
-    'source/libvpx/vp8/common/x86/mfqe_sse2.asm',
-    'source/libvpx/vp8/common/x86/postproc_mmx.asm',
-    'source/libvpx/vp8/common/x86/postproc_sse2.asm',
-    'source/libvpx/vp8/common/x86/postproc_x86.c',
-    'source/libvpx/vp8/common/x86/recon_mmx.asm',
-    'source/libvpx/vp8/common/x86/recon_sse2.asm',
-    'source/libvpx/vp8/common/x86/recon_wrapper_sse2.c',
-    'source/libvpx/vp8/common/x86/sad_mmx.asm',
-    'source/libvpx/vp8/common/x86/sad_sse2.asm',
-    'source/libvpx/vp8/common/x86/sad_sse3.asm',
-    'source/libvpx/vp8/common/x86/sad_sse4.asm',
-    'source/libvpx/vp8/common/x86/sad_ssse3.asm',
-    'source/libvpx/vp8/common/x86/subpixel_mmx.asm',
-    'source/libvpx/vp8/common/x86/subpixel_sse2.asm',
-    'source/libvpx/vp8/common/x86/subpixel_ssse3.asm',
-    'source/libvpx/vp8/common/x86/variance_impl_mmx.asm',
-    'source/libvpx/vp8/common/x86/variance_impl_sse2.asm',
-    'source/libvpx/vp8/common/x86/variance_impl_ssse3.asm',
-    'source/libvpx/vp8/common/x86/variance_mmx.c',
-    'source/libvpx/vp8/common/x86/variance_sse2.c',
-    'source/libvpx/vp8/common/x86/variance_ssse3.c',
-    'source/libvpx/vp8/common/x86/vp8_asm_stubs.c',
-    'source/libvpx/vp8/decoder/dboolhuff.c',
-    'source/libvpx/vp8/decoder/dboolhuff.h',
-    'source/libvpx/vp8/decoder/decodemv.c',
-    'source/libvpx/vp8/decoder/decodemv.h',
-    'source/libvpx/vp8/decoder/decoderthreading.h',
-    'source/libvpx/vp8/decoder/decodframe.c',
-    'source/libvpx/vp8/decoder/detokenize.c',
-    'source/libvpx/vp8/decoder/detokenize.h',
-    'source/libvpx/vp8/decoder/ec_types.h',
-    'source/libvpx/vp8/decoder/error_concealment.c',
-    'source/libvpx/vp8/decoder/error_concealment.h',
-    'source/libvpx/vp8/decoder/onyxd_if.c',
-    'source/libvpx/vp8/decoder/onyxd_int.h',
-    'source/libvpx/vp8/decoder/threading.c',
-    'source/libvpx/vp8/decoder/treereader.h',
-    'source/libvpx/vp8/encoder/bitstream.c',
-    'source/libvpx/vp8/encoder/bitstream.h',
-    'source/libvpx/vp8/encoder/block.h',
-    'source/libvpx/vp8/encoder/boolhuff.c',
-    'source/libvpx/vp8/encoder/boolhuff.h',
-    'source/libvpx/vp8/encoder/dct.c',
-    'source/libvpx/vp8/encoder/dct_value_cost.h',
-    'source/libvpx/vp8/encoder/dct_value_tokens.h',
-    'source/libvpx/vp8/encoder/defaultcoefcounts.h',
-    'source/libvpx/vp8/encoder/denoising.c',
-    'source/libvpx/vp8/encoder/denoising.h',
-    'source/libvpx/vp8/encoder/encodeframe.c',
-    'source/libvpx/vp8/encoder/encodeframe.h',
-    'source/libvpx/vp8/encoder/encodeintra.c',
-    'source/libvpx/vp8/encoder/encodeintra.h',
-    'source/libvpx/vp8/encoder/encodemb.c',
-    'source/libvpx/vp8/encoder/encodemb.h',
-    'source/libvpx/vp8/encoder/encodemv.c',
-    'source/libvpx/vp8/encoder/encodemv.h',
-    'source/libvpx/vp8/encoder/ethreading.c',
-    'source/libvpx/vp8/encoder/firstpass.h',
-    'source/libvpx/vp8/encoder/lookahead.c',
-    'source/libvpx/vp8/encoder/lookahead.h',
-    'source/libvpx/vp8/encoder/mcomp.c',
-    'source/libvpx/vp8/encoder/mcomp.h',
-    'source/libvpx/vp8/encoder/modecosts.c',
-    'source/libvpx/vp8/encoder/modecosts.h',
-    'source/libvpx/vp8/encoder/mr_dissim.c',
-    'source/libvpx/vp8/encoder/mr_dissim.h',
-    'source/libvpx/vp8/encoder/onyx_if.c',
-    'source/libvpx/vp8/encoder/onyx_int.h',
-    'source/libvpx/vp8/encoder/pickinter.c',
-    'source/libvpx/vp8/encoder/pickinter.h',
-    'source/libvpx/vp8/encoder/picklpf.c',
-    'source/libvpx/vp8/encoder/psnr.c',
-    'source/libvpx/vp8/encoder/psnr.h',
-    'source/libvpx/vp8/encoder/quantize.c',
-    'source/libvpx/vp8/encoder/quantize.h',
-    'source/libvpx/vp8/encoder/ratectrl.c',
-    'source/libvpx/vp8/encoder/ratectrl.h',
-    'source/libvpx/vp8/encoder/rdopt.c',
-    'source/libvpx/vp8/encoder/rdopt.h',
-    'source/libvpx/vp8/encoder/segmentation.c',
-    'source/libvpx/vp8/encoder/segmentation.h',
-    'source/libvpx/vp8/encoder/tokenize.c',
-    'source/libvpx/vp8/encoder/tokenize.h',
-    'source/libvpx/vp8/encoder/treewriter.c',
-    'source/libvpx/vp8/encoder/treewriter.h',
-    'source/libvpx/vp8/encoder/x86/dct_mmx.asm',
-    'source/libvpx/vp8/encoder/x86/dct_sse2.asm',
+    '<(libvpx_src_dir)/vp8/common/alloccommon.c',
+    '<(libvpx_src_dir)/vp8/common/alloccommon.h',
+    '<(libvpx_src_dir)/vp8/common/blockd.c',
+    '<(libvpx_src_dir)/vp8/common/blockd.h',
+    '<(libvpx_src_dir)/vp8/common/coefupdateprobs.h',
+    '<(libvpx_src_dir)/vp8/common/common.h',
+    '<(libvpx_src_dir)/vp8/common/debugmodes.c',
+    '<(libvpx_src_dir)/vp8/common/default_coef_probs.h',
+    '<(libvpx_src_dir)/vp8/common/dequantize.c',
+    '<(libvpx_src_dir)/vp8/common/entropy.c',
+    '<(libvpx_src_dir)/vp8/common/entropy.h',
+    '<(libvpx_src_dir)/vp8/common/entropymode.c',
+    '<(libvpx_src_dir)/vp8/common/entropymode.h',
+    '<(libvpx_src_dir)/vp8/common/entropymv.c',
+    '<(libvpx_src_dir)/vp8/common/entropymv.h',
+    '<(libvpx_src_dir)/vp8/common/extend.c',
+    '<(libvpx_src_dir)/vp8/common/extend.h',
+    '<(libvpx_src_dir)/vp8/common/filter.c',
+    '<(libvpx_src_dir)/vp8/common/filter.h',
+    '<(libvpx_src_dir)/vp8/common/findnearmv.c',
+    '<(libvpx_src_dir)/vp8/common/findnearmv.h',
+    '<(libvpx_src_dir)/vp8/common/generic/systemdependent.c',
+    '<(libvpx_src_dir)/vp8/common/header.h',
+    '<(libvpx_src_dir)/vp8/common/idct_blk.c',
+    '<(libvpx_src_dir)/vp8/common/idctllm.c',
+    '<(libvpx_src_dir)/vp8/common/invtrans.h',
+    '<(libvpx_src_dir)/vp8/common/loopfilter.c',
+    '<(libvpx_src_dir)/vp8/common/loopfilter_filters.c',
+    '<(libvpx_src_dir)/vp8/common/loopfilter.h',
+    '<(libvpx_src_dir)/vp8/common/mbpitch.c',
+    '<(libvpx_src_dir)/vp8/common/mfqe.c',
+    '<(libvpx_src_dir)/vp8/common/modecont.c',
+    '<(libvpx_src_dir)/vp8/common/modecont.h',
+    '<(libvpx_src_dir)/vp8/common/mv.h',
+    '<(libvpx_src_dir)/vp8/common/onyxc_int.h',
+    '<(libvpx_src_dir)/vp8/common/onyxd.h',
+    '<(libvpx_src_dir)/vp8/common/onyx.h',
+    '<(libvpx_src_dir)/vp8/common/postproc.c',
+    '<(libvpx_src_dir)/vp8/common/postproc.h',
+    '<(libvpx_src_dir)/vp8/common/ppflags.h',
+    '<(libvpx_src_dir)/vp8/common/pragmas.h',
+    '<(libvpx_src_dir)/vp8/common/quant_common.c',
+    '<(libvpx_src_dir)/vp8/common/quant_common.h',
+    '<(libvpx_src_dir)/vp8/common/reconinter.c',
+    '<(libvpx_src_dir)/vp8/common/reconinter.h',
+    '<(libvpx_src_dir)/vp8/common/reconintra4x4.c',
+    '<(libvpx_src_dir)/vp8/common/reconintra4x4.h',
+    '<(libvpx_src_dir)/vp8/common/reconintra.c',
+    '<(libvpx_src_dir)/vp8/common/rtcd.c',
+    '<(libvpx_src_dir)/vp8/common/sad_c.c',
+    '<(libvpx_src_dir)/vp8/common/setupintrarecon.c',
+    '<(libvpx_src_dir)/vp8/common/setupintrarecon.h',
+    '<(libvpx_src_dir)/vp8/common/swapyv12buffer.c',
+    '<(libvpx_src_dir)/vp8/common/swapyv12buffer.h',
+    '<(libvpx_src_dir)/vp8/common/systemdependent.h',
+    '<(libvpx_src_dir)/vp8/common/threading.h',
+    '<(libvpx_src_dir)/vp8/common/treecoder.c',
+    '<(libvpx_src_dir)/vp8/common/treecoder.h',
+    '<(libvpx_src_dir)/vp8/common/variance_c.c',
+    '<(libvpx_src_dir)/vp8/common/variance.h',
+    '<(libvpx_src_dir)/vp8/common/vp8_entropymodedata.h',
+    '<(libvpx_src_dir)/vp8/common/x86/dequantize_mmx.asm',
+    '<(libvpx_src_dir)/vp8/common/x86/filter_x86.c',
+    '<(libvpx_src_dir)/vp8/common/x86/filter_x86.h',
+    '<(libvpx_src_dir)/vp8/common/x86/idct_blk_mmx.c',
+    '<(libvpx_src_dir)/vp8/common/x86/idct_blk_sse2.c',
+    '<(libvpx_src_dir)/vp8/common/x86/idctllm_mmx.asm',
+    '<(libvpx_src_dir)/vp8/common/x86/idctllm_sse2.asm',
+    '<(libvpx_src_dir)/vp8/common/x86/iwalsh_mmx.asm',
+    '<(libvpx_src_dir)/vp8/common/x86/iwalsh_sse2.asm',
+    '<(libvpx_src_dir)/vp8/common/x86/loopfilter_mmx.asm',
+    '<(libvpx_src_dir)/vp8/common/x86/loopfilter_sse2.asm',
+    '<(libvpx_src_dir)/vp8/common/x86/loopfilter_x86.c',
+    '<(libvpx_src_dir)/vp8/common/x86/mfqe_sse2.asm',
+    '<(libvpx_src_dir)/vp8/common/x86/postproc_mmx.asm',
+    '<(libvpx_src_dir)/vp8/common/x86/postproc_sse2.asm',
+    '<(libvpx_src_dir)/vp8/common/x86/postproc_x86.c',
+    '<(libvpx_src_dir)/vp8/common/x86/recon_mmx.asm',
+    '<(libvpx_src_dir)/vp8/common/x86/recon_sse2.asm',
+    '<(libvpx_src_dir)/vp8/common/x86/recon_wrapper_sse2.c',
+    '<(libvpx_src_dir)/vp8/common/x86/sad_mmx.asm',
+    '<(libvpx_src_dir)/vp8/common/x86/sad_sse2.asm',
+    '<(libvpx_src_dir)/vp8/common/x86/sad_sse3.asm',
+    '<(libvpx_src_dir)/vp8/common/x86/sad_sse4.asm',
+    '<(libvpx_src_dir)/vp8/common/x86/sad_ssse3.asm',
+    '<(libvpx_src_dir)/vp8/common/x86/subpixel_mmx.asm',
+    '<(libvpx_src_dir)/vp8/common/x86/subpixel_sse2.asm',
+    '<(libvpx_src_dir)/vp8/common/x86/subpixel_ssse3.asm',
+    '<(libvpx_src_dir)/vp8/common/x86/variance_impl_mmx.asm',
+    '<(libvpx_src_dir)/vp8/common/x86/variance_impl_sse2.asm',
+    '<(libvpx_src_dir)/vp8/common/x86/variance_impl_ssse3.asm',
+    '<(libvpx_src_dir)/vp8/common/x86/variance_mmx.c',
+    '<(libvpx_src_dir)/vp8/common/x86/variance_sse2.c',
+    '<(libvpx_src_dir)/vp8/common/x86/variance_ssse3.c',
+    '<(libvpx_src_dir)/vp8/common/x86/vp8_asm_stubs.c',
+    '<(libvpx_src_dir)/vp8/decoder/dboolhuff.c',
+    '<(libvpx_src_dir)/vp8/decoder/dboolhuff.h',
+    '<(libvpx_src_dir)/vp8/decoder/decodemv.c',
+    '<(libvpx_src_dir)/vp8/decoder/decodemv.h',
+    '<(libvpx_src_dir)/vp8/decoder/decoderthreading.h',
+    '<(libvpx_src_dir)/vp8/decoder/decodframe.c',
+    '<(libvpx_src_dir)/vp8/decoder/detokenize.c',
+    '<(libvpx_src_dir)/vp8/decoder/detokenize.h',
+    '<(libvpx_src_dir)/vp8/decoder/ec_types.h',
+    '<(libvpx_src_dir)/vp8/decoder/error_concealment.c',
+    '<(libvpx_src_dir)/vp8/decoder/error_concealment.h',
+    '<(libvpx_src_dir)/vp8/decoder/onyxd_if.c',
+    '<(libvpx_src_dir)/vp8/decoder/onyxd_int.h',
+    '<(libvpx_src_dir)/vp8/decoder/threading.c',
+    '<(libvpx_src_dir)/vp8/decoder/treereader.h',
+    '<(libvpx_src_dir)/vp8/encoder/bitstream.c',
+    '<(libvpx_src_dir)/vp8/encoder/bitstream.h',
+    '<(libvpx_src_dir)/vp8/encoder/block.h',
+    '<(libvpx_src_dir)/vp8/encoder/boolhuff.c',
+    '<(libvpx_src_dir)/vp8/encoder/boolhuff.h',
+    '<(libvpx_src_dir)/vp8/encoder/dct.c',
+    '<(libvpx_src_dir)/vp8/encoder/dct_value_cost.h',
+    '<(libvpx_src_dir)/vp8/encoder/dct_value_tokens.h',
+    '<(libvpx_src_dir)/vp8/encoder/defaultcoefcounts.h',
+    '<(libvpx_src_dir)/vp8/encoder/denoising.c',
+    '<(libvpx_src_dir)/vp8/encoder/denoising.h',
+    '<(libvpx_src_dir)/vp8/encoder/encodeframe.c',
+    '<(libvpx_src_dir)/vp8/encoder/encodeframe.h',
+    '<(libvpx_src_dir)/vp8/encoder/encodeintra.c',
+    '<(libvpx_src_dir)/vp8/encoder/encodeintra.h',
+    '<(libvpx_src_dir)/vp8/encoder/encodemb.c',
+    '<(libvpx_src_dir)/vp8/encoder/encodemb.h',
+    '<(libvpx_src_dir)/vp8/encoder/encodemv.c',
+    '<(libvpx_src_dir)/vp8/encoder/encodemv.h',
+    '<(libvpx_src_dir)/vp8/encoder/ethreading.c',
+    '<(libvpx_src_dir)/vp8/encoder/firstpass.h',
+    '<(libvpx_src_dir)/vp8/encoder/lookahead.c',
+    '<(libvpx_src_dir)/vp8/encoder/lookahead.h',
+    '<(libvpx_src_dir)/vp8/encoder/mcomp.c',
+    '<(libvpx_src_dir)/vp8/encoder/mcomp.h',
+    '<(libvpx_src_dir)/vp8/encoder/modecosts.c',
+    '<(libvpx_src_dir)/vp8/encoder/modecosts.h',
+    '<(libvpx_src_dir)/vp8/encoder/mr_dissim.c',
+    '<(libvpx_src_dir)/vp8/encoder/mr_dissim.h',
+    '<(libvpx_src_dir)/vp8/encoder/onyx_if.c',
+    '<(libvpx_src_dir)/vp8/encoder/onyx_int.h',
+    '<(libvpx_src_dir)/vp8/encoder/pickinter.c',
+    '<(libvpx_src_dir)/vp8/encoder/pickinter.h',
+    '<(libvpx_src_dir)/vp8/encoder/picklpf.c',
+    '<(libvpx_src_dir)/vp8/encoder/psnr.c',
+    '<(libvpx_src_dir)/vp8/encoder/psnr.h',
+    '<(libvpx_src_dir)/vp8/encoder/quantize.c',
+    '<(libvpx_src_dir)/vp8/encoder/quantize.h',
+    '<(libvpx_src_dir)/vp8/encoder/ratectrl.c',
+    '<(libvpx_src_dir)/vp8/encoder/ratectrl.h',
+    '<(libvpx_src_dir)/vp8/encoder/rdopt.c',
+    '<(libvpx_src_dir)/vp8/encoder/rdopt.h',
+    '<(libvpx_src_dir)/vp8/encoder/segmentation.c',
+    '<(libvpx_src_dir)/vp8/encoder/segmentation.h',
+    '<(libvpx_src_dir)/vp8/encoder/tokenize.c',
+    '<(libvpx_src_dir)/vp8/encoder/tokenize.h',
+    '<(libvpx_src_dir)/vp8/encoder/treewriter.c',
+    '<(libvpx_src_dir)/vp8/encoder/treewriter.h',
+    '<(libvpx_src_dir)/vp8/encoder/x86/dct_mmx.asm',
+    '<(libvpx_src_dir)/vp8/encoder/x86/dct_sse2.asm',
     # Manually removed; refer to libvpx.gyp
-    #'source/libvpx/vp8/encoder/x86/denoising_sse2.c',
-    'source/libvpx/vp8/encoder/x86/encodeopt.asm',
-    'source/libvpx/vp8/encoder/x86/fwalsh_sse2.asm',
-    'source/libvpx/vp8/encoder/x86/quantize_mmx.asm',
-    'source/libvpx/vp8/encoder/x86/quantize_sse2.asm',
-    'source/libvpx/vp8/encoder/x86/quantize_sse4.asm',
-    'source/libvpx/vp8/encoder/x86/quantize_ssse3.asm',
-    'source/libvpx/vp8/encoder/x86/subtract_mmx.asm',
-    'source/libvpx/vp8/encoder/x86/subtract_sse2.asm',
-    'source/libvpx/vp8/encoder/x86/vp8_enc_stubs_mmx.c',
-    'source/libvpx/vp8/encoder/x86/vp8_enc_stubs_sse2.c',
-    'source/libvpx/vp8/vp8_cx_iface.c',
-    'source/libvpx/vp8/vp8_dx_iface.c',
-    'source/libvpx/vpx/internal/vpx_codec_internal.h',
-    'source/libvpx/vpx_mem/include/vpx_mem_intrnl.h',
-    'source/libvpx/vpx_mem/vpx_mem.c',
-    'source/libvpx/vpx_mem/vpx_mem.h',
-    'source/libvpx/vpx_ports/asm_offsets.h',
-    'source/libvpx/vpx_ports/emms.asm',
-    'source/libvpx/vpx_ports/mem.h',
-    'source/libvpx/vpx_ports/vpx_timer.h',
-    'source/libvpx/vpx_ports/x86_abi_support.asm',
-    'source/libvpx/vpx_ports/x86_cpuid.c',
-    'source/libvpx/vpx_ports/x86.h',
-    'source/libvpx/vpx_scale/generic/gen_scalers.c',
-    'source/libvpx/vpx_scale/generic/vpxscale.c',
-    'source/libvpx/vpx_scale/generic/yv12config.c',
-    'source/libvpx/vpx_scale/generic/yv12extend.c',
-    'source/libvpx/vpx_scale/generic/yv12extend_generic.h',
-    'source/libvpx/vpx_scale/scale_mode.h',
-    'source/libvpx/vpx_scale/vpxscale.h',
-    'source/libvpx/vpx_scale/yv12config.h',
-    'source/libvpx/vpx/src/vpx_codec.c',
-    'source/libvpx/vpx/src/vpx_decoder.c',
-    'source/libvpx/vpx/src/vpx_encoder.c',
-    'source/libvpx/vpx/src/vpx_image.c',
-    'source/libvpx/vpx/vp8cx.h',
-    'source/libvpx/vpx/vp8dx.h',
-    'source/libvpx/vpx/vp8.h',
-    'source/libvpx/vpx/vpx_codec.h',
-    'source/libvpx/vpx/vpx_codec_impl_bottom.h',
-    'source/libvpx/vpx/vpx_codec_impl_top.h',
-    'source/libvpx/vpx/vpx_decoder.h',
-    'source/libvpx/vpx/vpx_encoder.h',
-    'source/libvpx/vpx/vpx_image.h',
-    'source/libvpx/vpx/vpx_integer.h',
+    #'<(libvpx_src_dir)/vp8/encoder/x86/denoising_sse2.c',
+    '<(libvpx_src_dir)/vp8/encoder/x86/encodeopt.asm',
+    '<(libvpx_src_dir)/vp8/encoder/x86/fwalsh_sse2.asm',
+    '<(libvpx_src_dir)/vp8/encoder/x86/quantize_mmx.asm',
+    '<(libvpx_src_dir)/vp8/encoder/x86/quantize_sse2.asm',
+    '<(libvpx_src_dir)/vp8/encoder/x86/quantize_sse4.asm',
+    '<(libvpx_src_dir)/vp8/encoder/x86/quantize_ssse3.asm',
+    '<(libvpx_src_dir)/vp8/encoder/x86/subtract_mmx.asm',
+    '<(libvpx_src_dir)/vp8/encoder/x86/subtract_sse2.asm',
+    '<(libvpx_src_dir)/vp8/encoder/x86/vp8_enc_stubs_mmx.c',
+    '<(libvpx_src_dir)/vp8/encoder/x86/vp8_enc_stubs_sse2.c',
+    '<(libvpx_src_dir)/vp8/vp8_cx_iface.c',
+    '<(libvpx_src_dir)/vp8/vp8_dx_iface.c',
+    '<(libvpx_src_dir)/vpx/internal/vpx_codec_internal.h',
+    '<(libvpx_src_dir)/vpx_mem/include/vpx_mem_intrnl.h',
+    '<(libvpx_src_dir)/vpx_mem/vpx_mem.c',
+    '<(libvpx_src_dir)/vpx_mem/vpx_mem.h',
+    '<(libvpx_src_dir)/vpx_ports/asm_offsets.h',
+    '<(libvpx_src_dir)/vpx_ports/emms.asm',
+    '<(libvpx_src_dir)/vpx_ports/mem.h',
+    '<(libvpx_src_dir)/vpx_ports/vpx_timer.h',
+    '<(libvpx_src_dir)/vpx_ports/x86_abi_support.asm',
+    '<(libvpx_src_dir)/vpx_ports/x86_cpuid.c',
+    '<(libvpx_src_dir)/vpx_ports/x86.h',
+    '<(libvpx_src_dir)/vpx_scale/generic/gen_scalers.c',
+    '<(libvpx_src_dir)/vpx_scale/generic/vpxscale.c',
+    '<(libvpx_src_dir)/vpx_scale/generic/yv12config.c',
+    '<(libvpx_src_dir)/vpx_scale/generic/yv12extend.c',
+    '<(libvpx_src_dir)/vpx_scale/generic/yv12extend_generic.h',
+    '<(libvpx_src_dir)/vpx_scale/scale_mode.h',
+    '<(libvpx_src_dir)/vpx_scale/vpxscale.h',
+    '<(libvpx_src_dir)/vpx_scale/yv12config.h',
+    '<(libvpx_src_dir)/vpx/src/vpx_codec.c',
+    '<(libvpx_src_dir)/vpx/src/vpx_decoder.c',
+    '<(libvpx_src_dir)/vpx/src/vpx_encoder.c',
+    '<(libvpx_src_dir)/vpx/src/vpx_image.c',
+    '<(libvpx_src_dir)/vpx/vp8cx.h',
+    '<(libvpx_src_dir)/vpx/vp8dx.h',
+    '<(libvpx_src_dir)/vpx/vp8.h',
+    '<(libvpx_src_dir)/vpx/vpx_codec.h',
+    '<(libvpx_src_dir)/vpx/vpx_codec_impl_bottom.h',
+    '<(libvpx_src_dir)/vpx/vpx_codec_impl_top.h',
+    '<(libvpx_src_dir)/vpx/vpx_decoder.h',
+    '<(libvpx_src_dir)/vpx/vpx_encoder.h',
+    '<(libvpx_src_dir)/vpx/vpx_image.h',
+    '<(libvpx_src_dir)/vpx/vpx_integer.h',
   ],
 }
diff --git a/third_party/libvpx/libvpx_srcs_x86_64.gypi b/third_party/libvpx/libvpx_srcs_x86_64.gypi
index 70b4a8dea..c00efe8e3 100644
--- a/third_party/libvpx/libvpx_srcs_x86_64.gypi
+++ b/third_party/libvpx/libvpx_srcs_x86_64.gypi
@@ -5,214 +5,214 @@
 
 {
   'sources': [
-    'source/libvpx/vp8/common/alloccommon.c',
-    'source/libvpx/vp8/common/alloccommon.h',
-    'source/libvpx/vp8/common/blockd.c',
-    'source/libvpx/vp8/common/blockd.h',
-    'source/libvpx/vp8/common/coefupdateprobs.h',
-    'source/libvpx/vp8/common/common.h',
-    'source/libvpx/vp8/common/debugmodes.c',
-    'source/libvpx/vp8/common/default_coef_probs.h',
-    'source/libvpx/vp8/common/dequantize.c',
-    'source/libvpx/vp8/common/entropy.c',
-    'source/libvpx/vp8/common/entropy.h',
-    'source/libvpx/vp8/common/entropymode.c',
-    'source/libvpx/vp8/common/entropymode.h',
-    'source/libvpx/vp8/common/entropymv.c',
-    'source/libvpx/vp8/common/entropymv.h',
-    'source/libvpx/vp8/common/extend.c',
-    'source/libvpx/vp8/common/extend.h',
-    'source/libvpx/vp8/common/filter.c',
-    'source/libvpx/vp8/common/filter.h',
-    'source/libvpx/vp8/common/findnearmv.c',
-    'source/libvpx/vp8/common/findnearmv.h',
-    'source/libvpx/vp8/common/generic/systemdependent.c',
-    'source/libvpx/vp8/common/header.h',
-    'source/libvpx/vp8/common/idct_blk.c',
-    'source/libvpx/vp8/common/idctllm.c',
-    'source/libvpx/vp8/common/invtrans.h',
-    'source/libvpx/vp8/common/loopfilter.c',
-    'source/libvpx/vp8/common/loopfilter_filters.c',
-    'source/libvpx/vp8/common/loopfilter.h',
-    'source/libvpx/vp8/common/mbpitch.c',
-    'source/libvpx/vp8/common/mfqe.c',
-    'source/libvpx/vp8/common/modecont.c',
-    'source/libvpx/vp8/common/modecont.h',
-    'source/libvpx/vp8/common/mv.h',
-    'source/libvpx/vp8/common/onyxc_int.h',
-    'source/libvpx/vp8/common/onyxd.h',
-    'source/libvpx/vp8/common/onyx.h',
-    'source/libvpx/vp8/common/postproc.c',
-    'source/libvpx/vp8/common/postproc.h',
-    'source/libvpx/vp8/common/ppflags.h',
-    'source/libvpx/vp8/common/pragmas.h',
-    'source/libvpx/vp8/common/quant_common.c',
-    'source/libvpx/vp8/common/quant_common.h',
-    'source/libvpx/vp8/common/reconinter.c',
-    'source/libvpx/vp8/common/reconinter.h',
-    'source/libvpx/vp8/common/reconintra4x4.c',
-    'source/libvpx/vp8/common/reconintra4x4.h',
-    'source/libvpx/vp8/common/reconintra.c',
-    'source/libvpx/vp8/common/rtcd.c',
-    'source/libvpx/vp8/common/sad_c.c',
-    'source/libvpx/vp8/common/setupintrarecon.c',
-    'source/libvpx/vp8/common/setupintrarecon.h',
-    'source/libvpx/vp8/common/swapyv12buffer.c',
-    'source/libvpx/vp8/common/swapyv12buffer.h',
-    'source/libvpx/vp8/common/systemdependent.h',
-    'source/libvpx/vp8/common/threading.h',
-    'source/libvpx/vp8/common/treecoder.c',
-    'source/libvpx/vp8/common/treecoder.h',
-    'source/libvpx/vp8/common/variance_c.c',
-    'source/libvpx/vp8/common/variance.h',
-    'source/libvpx/vp8/common/vp8_entropymodedata.h',
-    'source/libvpx/vp8/common/x86/dequantize_mmx.asm',
-    'source/libvpx/vp8/common/x86/filter_x86.c',
-    'source/libvpx/vp8/common/x86/filter_x86.h',
-    'source/libvpx/vp8/common/x86/idct_blk_mmx.c',
-    'source/libvpx/vp8/common/x86/idct_blk_sse2.c',
-    'source/libvpx/vp8/common/x86/idctllm_mmx.asm',
-    'source/libvpx/vp8/common/x86/idctllm_sse2.asm',
-    'source/libvpx/vp8/common/x86/iwalsh_mmx.asm',
-    'source/libvpx/vp8/common/x86/iwalsh_sse2.asm',
-    'source/libvpx/vp8/common/x86/loopfilter_block_sse2.asm',
-    'source/libvpx/vp8/common/x86/loopfilter_mmx.asm',
-    'source/libvpx/vp8/common/x86/loopfilter_sse2.asm',
-    'source/libvpx/vp8/common/x86/loopfilter_x86.c',
-    'source/libvpx/vp8/common/x86/mfqe_sse2.asm',
-    'source/libvpx/vp8/common/x86/postproc_mmx.asm',
-    'source/libvpx/vp8/common/x86/postproc_sse2.asm',
-    'source/libvpx/vp8/common/x86/postproc_x86.c',
-    'source/libvpx/vp8/common/x86/recon_mmx.asm',
-    'source/libvpx/vp8/common/x86/recon_sse2.asm',
-    'source/libvpx/vp8/common/x86/recon_wrapper_sse2.c',
-    'source/libvpx/vp8/common/x86/sad_mmx.asm',
-    'source/libvpx/vp8/common/x86/sad_sse2.asm',
-    'source/libvpx/vp8/common/x86/sad_sse3.asm',
-    'source/libvpx/vp8/common/x86/sad_sse4.asm',
-    'source/libvpx/vp8/common/x86/sad_ssse3.asm',
-    'source/libvpx/vp8/common/x86/subpixel_mmx.asm',
-    'source/libvpx/vp8/common/x86/subpixel_sse2.asm',
-    'source/libvpx/vp8/common/x86/subpixel_ssse3.asm',
-    'source/libvpx/vp8/common/x86/variance_impl_mmx.asm',
-    'source/libvpx/vp8/common/x86/variance_impl_sse2.asm',
-    'source/libvpx/vp8/common/x86/variance_impl_ssse3.asm',
-    'source/libvpx/vp8/common/x86/variance_mmx.c',
-    'source/libvpx/vp8/common/x86/variance_sse2.c',
-    'source/libvpx/vp8/common/x86/variance_ssse3.c',
-    'source/libvpx/vp8/common/x86/vp8_asm_stubs.c',
-    'source/libvpx/vp8/decoder/dboolhuff.c',
-    'source/libvpx/vp8/decoder/dboolhuff.h',
-    'source/libvpx/vp8/decoder/decodemv.c',
-    'source/libvpx/vp8/decoder/decodemv.h',
-    'source/libvpx/vp8/decoder/decoderthreading.h',
-    'source/libvpx/vp8/decoder/decodframe.c',
-    'source/libvpx/vp8/decoder/detokenize.c',
-    'source/libvpx/vp8/decoder/detokenize.h',
-    'source/libvpx/vp8/decoder/ec_types.h',
-    'source/libvpx/vp8/decoder/error_concealment.c',
-    'source/libvpx/vp8/decoder/error_concealment.h',
-    'source/libvpx/vp8/decoder/onyxd_if.c',
-    'source/libvpx/vp8/decoder/onyxd_int.h',
-    'source/libvpx/vp8/decoder/threading.c',
-    'source/libvpx/vp8/decoder/treereader.h',
-    'source/libvpx/vp8/encoder/bitstream.c',
-    'source/libvpx/vp8/encoder/bitstream.h',
-    'source/libvpx/vp8/encoder/block.h',
-    'source/libvpx/vp8/encoder/boolhuff.c',
-    'source/libvpx/vp8/encoder/boolhuff.h',
-    'source/libvpx/vp8/encoder/dct.c',
-    'source/libvpx/vp8/encoder/dct_value_cost.h',
-    'source/libvpx/vp8/encoder/dct_value_tokens.h',
-    'source/libvpx/vp8/encoder/defaultcoefcounts.h',
-    'source/libvpx/vp8/encoder/denoising.c',
-    'source/libvpx/vp8/encoder/denoising.h',
-    'source/libvpx/vp8/encoder/encodeframe.c',
-    'source/libvpx/vp8/encoder/encodeframe.h',
-    'source/libvpx/vp8/encoder/encodeintra.c',
-    'source/libvpx/vp8/encoder/encodeintra.h',
-    'source/libvpx/vp8/encoder/encodemb.c',
-    'source/libvpx/vp8/encoder/encodemb.h',
-    'source/libvpx/vp8/encoder/encodemv.c',
-    'source/libvpx/vp8/encoder/encodemv.h',
-    'source/libvpx/vp8/encoder/ethreading.c',
-    'source/libvpx/vp8/encoder/firstpass.h',
-    'source/libvpx/vp8/encoder/lookahead.c',
-    'source/libvpx/vp8/encoder/lookahead.h',
-    'source/libvpx/vp8/encoder/mcomp.c',
-    'source/libvpx/vp8/encoder/mcomp.h',
-    'source/libvpx/vp8/encoder/modecosts.c',
-    'source/libvpx/vp8/encoder/modecosts.h',
-    'source/libvpx/vp8/encoder/mr_dissim.c',
-    'source/libvpx/vp8/encoder/mr_dissim.h',
-    'source/libvpx/vp8/encoder/onyx_if.c',
-    'source/libvpx/vp8/encoder/onyx_int.h',
-    'source/libvpx/vp8/encoder/pickinter.c',
-    'source/libvpx/vp8/encoder/pickinter.h',
-    'source/libvpx/vp8/encoder/picklpf.c',
-    'source/libvpx/vp8/encoder/psnr.c',
-    'source/libvpx/vp8/encoder/psnr.h',
-    'source/libvpx/vp8/encoder/quantize.c',
-    'source/libvpx/vp8/encoder/quantize.h',
-    'source/libvpx/vp8/encoder/ratectrl.c',
-    'source/libvpx/vp8/encoder/ratectrl.h',
-    'source/libvpx/vp8/encoder/rdopt.c',
-    'source/libvpx/vp8/encoder/rdopt.h',
-    'source/libvpx/vp8/encoder/segmentation.c',
-    'source/libvpx/vp8/encoder/segmentation.h',
-    'source/libvpx/vp8/encoder/tokenize.c',
-    'source/libvpx/vp8/encoder/tokenize.h',
-    'source/libvpx/vp8/encoder/treewriter.c',
-    'source/libvpx/vp8/encoder/treewriter.h',
-    'source/libvpx/vp8/encoder/x86/dct_mmx.asm',
-    'source/libvpx/vp8/encoder/x86/dct_sse2.asm',
+    '<(libvpx_src_dir)/vp8/common/alloccommon.c',
+    '<(libvpx_src_dir)/vp8/common/alloccommon.h',
+    '<(libvpx_src_dir)/vp8/common/blockd.c',
+    '<(libvpx_src_dir)/vp8/common/blockd.h',
+    '<(libvpx_src_dir)/vp8/common/coefupdateprobs.h',
+    '<(libvpx_src_dir)/vp8/common/common.h',
+    '<(libvpx_src_dir)/vp8/common/debugmodes.c',
+    '<(libvpx_src_dir)/vp8/common/default_coef_probs.h',
+    '<(libvpx_src_dir)/vp8/common/dequantize.c',
+    '<(libvpx_src_dir)/vp8/common/entropy.c',
+    '<(libvpx_src_dir)/vp8/common/entropy.h',
+    '<(libvpx_src_dir)/vp8/common/entropymode.c',
+    '<(libvpx_src_dir)/vp8/common/entropymode.h',
+    '<(libvpx_src_dir)/vp8/common/entropymv.c',
+    '<(libvpx_src_dir)/vp8/common/entropymv.h',
+    '<(libvpx_src_dir)/vp8/common/extend.c',
+    '<(libvpx_src_dir)/vp8/common/extend.h',
+    '<(libvpx_src_dir)/vp8/common/filter.c',
+    '<(libvpx_src_dir)/vp8/common/filter.h',
+    '<(libvpx_src_dir)/vp8/common/findnearmv.c',
+    '<(libvpx_src_dir)/vp8/common/findnearmv.h',
+    '<(libvpx_src_dir)/vp8/common/generic/systemdependent.c',
+    '<(libvpx_src_dir)/vp8/common/header.h',
+    '<(libvpx_src_dir)/vp8/common/idct_blk.c',
+    '<(libvpx_src_dir)/vp8/common/idctllm.c',
+    '<(libvpx_src_dir)/vp8/common/invtrans.h',
+    '<(libvpx_src_dir)/vp8/common/loopfilter.c',
+    '<(libvpx_src_dir)/vp8/common/loopfilter_filters.c',
+    '<(libvpx_src_dir)/vp8/common/loopfilter.h',
+    '<(libvpx_src_dir)/vp8/common/mbpitch.c',
+    '<(libvpx_src_dir)/vp8/common/mfqe.c',
+    '<(libvpx_src_dir)/vp8/common/modecont.c',
+    '<(libvpx_src_dir)/vp8/common/modecont.h',
+    '<(libvpx_src_dir)/vp8/common/mv.h',
+    '<(libvpx_src_dir)/vp8/common/onyxc_int.h',
+    '<(libvpx_src_dir)/vp8/common/onyxd.h',
+    '<(libvpx_src_dir)/vp8/common/onyx.h',
+    '<(libvpx_src_dir)/vp8/common/postproc.c',
+    '<(libvpx_src_dir)/vp8/common/postproc.h',
+    '<(libvpx_src_dir)/vp8/common/ppflags.h',
+    '<(libvpx_src_dir)/vp8/common/pragmas.h',
+    '<(libvpx_src_dir)/vp8/common/quant_common.c',
+    '<(libvpx_src_dir)/vp8/common/quant_common.h',
+    '<(libvpx_src_dir)/vp8/common/reconinter.c',
+    '<(libvpx_src_dir)/vp8/common/reconinter.h',
+    '<(libvpx_src_dir)/vp8/common/reconintra4x4.c',
+    '<(libvpx_src_dir)/vp8/common/reconintra4x4.h',
+    '<(libvpx_src_dir)/vp8/common/reconintra.c',
+    '<(libvpx_src_dir)/vp8/common/rtcd.c',
+    '<(libvpx_src_dir)/vp8/common/sad_c.c',
+    '<(libvpx_src_dir)/vp8/common/setupintrarecon.c',
+    '<(libvpx_src_dir)/vp8/common/setupintrarecon.h',
+    '<(libvpx_src_dir)/vp8/common/swapyv12buffer.c',
+    '<(libvpx_src_dir)/vp8/common/swapyv12buffer.h',
+    '<(libvpx_src_dir)/vp8/common/systemdependent.h',
+    '<(libvpx_src_dir)/vp8/common/threading.h',
+    '<(libvpx_src_dir)/vp8/common/treecoder.c',
+    '<(libvpx_src_dir)/vp8/common/treecoder.h',
+    '<(libvpx_src_dir)/vp8/common/variance_c.c',
+    '<(libvpx_src_dir)/vp8/common/variance.h',
+    '<(libvpx_src_dir)/vp8/common/vp8_entropymodedata.h',
+    '<(libvpx_src_dir)/vp8/common/x86/dequantize_mmx.asm',
+    '<(libvpx_src_dir)/vp8/common/x86/filter_x86.c',
+    '<(libvpx_src_dir)/vp8/common/x86/filter_x86.h',
+    '<(libvpx_src_dir)/vp8/common/x86/idct_blk_mmx.c',
+    '<(libvpx_src_dir)/vp8/common/x86/idct_blk_sse2.c',
+    '<(libvpx_src_dir)/vp8/common/x86/idctllm_mmx.asm',
+    '<(libvpx_src_dir)/vp8/common/x86/idctllm_sse2.asm',
+    '<(libvpx_src_dir)/vp8/common/x86/iwalsh_mmx.asm',
+    '<(libvpx_src_dir)/vp8/common/x86/iwalsh_sse2.asm',
+    '<(libvpx_src_dir)/vp8/common/x86/loopfilter_block_sse2.asm',
+    '<(libvpx_src_dir)/vp8/common/x86/loopfilter_mmx.asm',
+    '<(libvpx_src_dir)/vp8/common/x86/loopfilter_sse2.asm',
+    '<(libvpx_src_dir)/vp8/common/x86/loopfilter_x86.c',
+    '<(libvpx_src_dir)/vp8/common/x86/mfqe_sse2.asm',
+    '<(libvpx_src_dir)/vp8/common/x86/postproc_mmx.asm',
+    '<(libvpx_src_dir)/vp8/common/x86/postproc_sse2.asm',
+    '<(libvpx_src_dir)/vp8/common/x86/postproc_x86.c',
+    '<(libvpx_src_dir)/vp8/common/x86/recon_mmx.asm',
+    '<(libvpx_src_dir)/vp8/common/x86/recon_sse2.asm',
+    '<(libvpx_src_dir)/vp8/common/x86/recon_wrapper_sse2.c',
+    '<(libvpx_src_dir)/vp8/common/x86/sad_mmx.asm',
+    '<(libvpx_src_dir)/vp8/common/x86/sad_sse2.asm',
+    '<(libvpx_src_dir)/vp8/common/x86/sad_sse3.asm',
+    '<(libvpx_src_dir)/vp8/common/x86/sad_sse4.asm',
+    '<(libvpx_src_dir)/vp8/common/x86/sad_ssse3.asm',
+    '<(libvpx_src_dir)/vp8/common/x86/subpixel_mmx.asm',
+    '<(libvpx_src_dir)/vp8/common/x86/subpixel_sse2.asm',
+    '<(libvpx_src_dir)/vp8/common/x86/subpixel_ssse3.asm',
+    '<(libvpx_src_dir)/vp8/common/x86/variance_impl_mmx.asm',
+    '<(libvpx_src_dir)/vp8/common/x86/variance_impl_sse2.asm',
+    '<(libvpx_src_dir)/vp8/common/x86/variance_impl_ssse3.asm',
+    '<(libvpx_src_dir)/vp8/common/x86/variance_mmx.c',
+    '<(libvpx_src_dir)/vp8/common/x86/variance_sse2.c',
+    '<(libvpx_src_dir)/vp8/common/x86/variance_ssse3.c',
+    '<(libvpx_src_dir)/vp8/common/x86/vp8_asm_stubs.c',
+    '<(libvpx_src_dir)/vp8/decoder/dboolhuff.c',
+    '<(libvpx_src_dir)/vp8/decoder/dboolhuff.h',
+    '<(libvpx_src_dir)/vp8/decoder/decodemv.c',
+    '<(libvpx_src_dir)/vp8/decoder/decodemv.h',
+    '<(libvpx_src_dir)/vp8/decoder/decoderthreading.h',
+    '<(libvpx_src_dir)/vp8/decoder/decodframe.c',
+    '<(libvpx_src_dir)/vp8/decoder/detokenize.c',
+    '<(libvpx_src_dir)/vp8/decoder/detokenize.h',
+    '<(libvpx_src_dir)/vp8/decoder/ec_types.h',
+    '<(libvpx_src_dir)/vp8/decoder/error_concealment.c',
+    '<(libvpx_src_dir)/vp8/decoder/error_concealment.h',
+    '<(libvpx_src_dir)/vp8/decoder/onyxd_if.c',
+    '<(libvpx_src_dir)/vp8/decoder/onyxd_int.h',
+    '<(libvpx_src_dir)/vp8/decoder/threading.c',
+    '<(libvpx_src_dir)/vp8/decoder/treereader.h',
+    '<(libvpx_src_dir)/vp8/encoder/bitstream.c',
+    '<(libvpx_src_dir)/vp8/encoder/bitstream.h',
+    '<(libvpx_src_dir)/vp8/encoder/block.h',
+    '<(libvpx_src_dir)/vp8/encoder/boolhuff.c',
+    '<(libvpx_src_dir)/vp8/encoder/boolhuff.h',
+    '<(libvpx_src_dir)/vp8/encoder/dct.c',
+    '<(libvpx_src_dir)/vp8/encoder/dct_value_cost.h',
+    '<(libvpx_src_dir)/vp8/encoder/dct_value_tokens.h',
+    '<(libvpx_src_dir)/vp8/encoder/defaultcoefcounts.h',
+    '<(libvpx_src_dir)/vp8/encoder/denoising.c',
+    '<(libvpx_src_dir)/vp8/encoder/denoising.h',
+    '<(libvpx_src_dir)/vp8/encoder/encodeframe.c',
+    '<(libvpx_src_dir)/vp8/encoder/encodeframe.h',
+    '<(libvpx_src_dir)/vp8/encoder/encodeintra.c',
+    '<(libvpx_src_dir)/vp8/encoder/encodeintra.h',
+    '<(libvpx_src_dir)/vp8/encoder/encodemb.c',
+    '<(libvpx_src_dir)/vp8/encoder/encodemb.h',
+    '<(libvpx_src_dir)/vp8/encoder/encodemv.c',
+    '<(libvpx_src_dir)/vp8/encoder/encodemv.h',
+    '<(libvpx_src_dir)/vp8/encoder/ethreading.c',
+    '<(libvpx_src_dir)/vp8/encoder/firstpass.h',
+    '<(libvpx_src_dir)/vp8/encoder/lookahead.c',
+    '<(libvpx_src_dir)/vp8/encoder/lookahead.h',
+    '<(libvpx_src_dir)/vp8/encoder/mcomp.c',
+    '<(libvpx_src_dir)/vp8/encoder/mcomp.h',
+    '<(libvpx_src_dir)/vp8/encoder/modecosts.c',
+    '<(libvpx_src_dir)/vp8/encoder/modecosts.h',
+    '<(libvpx_src_dir)/vp8/encoder/mr_dissim.c',
+    '<(libvpx_src_dir)/vp8/encoder/mr_dissim.h',
+    '<(libvpx_src_dir)/vp8/encoder/onyx_if.c',
+    '<(libvpx_src_dir)/vp8/encoder/onyx_int.h',
+    '<(libvpx_src_dir)/vp8/encoder/pickinter.c',
+    '<(libvpx_src_dir)/vp8/encoder/pickinter.h',
+    '<(libvpx_src_dir)/vp8/encoder/picklpf.c',
+    '<(libvpx_src_dir)/vp8/encoder/psnr.c',
+    '<(libvpx_src_dir)/vp8/encoder/psnr.h',
+    '<(libvpx_src_dir)/vp8/encoder/quantize.c',
+    '<(libvpx_src_dir)/vp8/encoder/quantize.h',
+    '<(libvpx_src_dir)/vp8/encoder/ratectrl.c',
+    '<(libvpx_src_dir)/vp8/encoder/ratectrl.h',
+    '<(libvpx_src_dir)/vp8/encoder/rdopt.c',
+    '<(libvpx_src_dir)/vp8/encoder/rdopt.h',
+    '<(libvpx_src_dir)/vp8/encoder/segmentation.c',
+    '<(libvpx_src_dir)/vp8/encoder/segmentation.h',
+    '<(libvpx_src_dir)/vp8/encoder/tokenize.c',
+    '<(libvpx_src_dir)/vp8/encoder/tokenize.h',
+    '<(libvpx_src_dir)/vp8/encoder/treewriter.c',
+    '<(libvpx_src_dir)/vp8/encoder/treewriter.h',
+    '<(libvpx_src_dir)/vp8/encoder/x86/dct_mmx.asm',
+    '<(libvpx_src_dir)/vp8/encoder/x86/dct_sse2.asm',
     # Manually removed; refer to libvpx.gyp
-    #'source/libvpx/vp8/encoder/x86/denoising_sse2.c',
-    'source/libvpx/vp8/encoder/x86/encodeopt.asm',
-    'source/libvpx/vp8/encoder/x86/fwalsh_sse2.asm',
-    'source/libvpx/vp8/encoder/x86/quantize_mmx.asm',
-    'source/libvpx/vp8/encoder/x86/quantize_sse2.asm',
-    'source/libvpx/vp8/encoder/x86/quantize_sse4.asm',
-    'source/libvpx/vp8/encoder/x86/quantize_ssse3.asm',
-    'source/libvpx/vp8/encoder/x86/ssim_opt.asm',
-    'source/libvpx/vp8/encoder/x86/subtract_mmx.asm',
-    'source/libvpx/vp8/encoder/x86/subtract_sse2.asm',
-    'source/libvpx/vp8/encoder/x86/vp8_enc_stubs_mmx.c',
-    'source/libvpx/vp8/encoder/x86/vp8_enc_stubs_sse2.c',
-    'source/libvpx/vp8/vp8_cx_iface.c',
-    'source/libvpx/vp8/vp8_dx_iface.c',
-    'source/libvpx/vpx/internal/vpx_codec_internal.h',
-    'source/libvpx/vpx_mem/include/vpx_mem_intrnl.h',
-    'source/libvpx/vpx_mem/vpx_mem.c',
-    'source/libvpx/vpx_mem/vpx_mem.h',
-    'source/libvpx/vpx_ports/asm_offsets.h',
-    'source/libvpx/vpx_ports/emms.asm',
-    'source/libvpx/vpx_ports/mem.h',
-    'source/libvpx/vpx_ports/vpx_timer.h',
-    'source/libvpx/vpx_ports/x86_abi_support.asm',
-    'source/libvpx/vpx_ports/x86_cpuid.c',
-    'source/libvpx/vpx_ports/x86.h',
-    'source/libvpx/vpx_scale/generic/gen_scalers.c',
-    'source/libvpx/vpx_scale/generic/vpxscale.c',
-    'source/libvpx/vpx_scale/generic/yv12config.c',
-    'source/libvpx/vpx_scale/generic/yv12extend.c',
-    'source/libvpx/vpx_scale/generic/yv12extend_generic.h',
-    'source/libvpx/vpx_scale/scale_mode.h',
-    'source/libvpx/vpx_scale/vpxscale.h',
-    'source/libvpx/vpx_scale/yv12config.h',
-    'source/libvpx/vpx/src/vpx_codec.c',
-    'source/libvpx/vpx/src/vpx_decoder.c',
-    'source/libvpx/vpx/src/vpx_encoder.c',
-    'source/libvpx/vpx/src/vpx_image.c',
-    'source/libvpx/vpx/vp8cx.h',
-    'source/libvpx/vpx/vp8dx.h',
-    'source/libvpx/vpx/vp8.h',
-    'source/libvpx/vpx/vpx_codec.h',
-    'source/libvpx/vpx/vpx_codec_impl_bottom.h',
-    'source/libvpx/vpx/vpx_codec_impl_top.h',
-    'source/libvpx/vpx/vpx_decoder.h',
-    'source/libvpx/vpx/vpx_encoder.h',
-    'source/libvpx/vpx/vpx_image.h',
-    'source/libvpx/vpx/vpx_integer.h',
+    #'<(libvpx_src_dir)/vp8/encoder/x86/denoising_sse2.c',
+    '<(libvpx_src_dir)/vp8/encoder/x86/encodeopt.asm',
+    '<(libvpx_src_dir)/vp8/encoder/x86/fwalsh_sse2.asm',
+    '<(libvpx_src_dir)/vp8/encoder/x86/quantize_mmx.asm',
+    '<(libvpx_src_dir)/vp8/encoder/x86/quantize_sse2.asm',
+    '<(libvpx_src_dir)/vp8/encoder/x86/quantize_sse4.asm',
+    '<(libvpx_src_dir)/vp8/encoder/x86/quantize_ssse3.asm',
+    '<(libvpx_src_dir)/vp8/encoder/x86/ssim_opt.asm',
+    '<(libvpx_src_dir)/vp8/encoder/x86/subtract_mmx.asm',
+    '<(libvpx_src_dir)/vp8/encoder/x86/subtract_sse2.asm',
+    '<(libvpx_src_dir)/vp8/encoder/x86/vp8_enc_stubs_mmx.c',
+    '<(libvpx_src_dir)/vp8/encoder/x86/vp8_enc_stubs_sse2.c',
+    '<(libvpx_src_dir)/vp8/vp8_cx_iface.c',
+    '<(libvpx_src_dir)/vp8/vp8_dx_iface.c',
+    '<(libvpx_src_dir)/vpx/internal/vpx_codec_internal.h',
+    '<(libvpx_src_dir)/vpx_mem/include/vpx_mem_intrnl.h',
+    '<(libvpx_src_dir)/vpx_mem/vpx_mem.c',
+    '<(libvpx_src_dir)/vpx_mem/vpx_mem.h',
+    '<(libvpx_src_dir)/vpx_ports/asm_offsets.h',
+    '<(libvpx_src_dir)/vpx_ports/emms.asm',
+    '<(libvpx_src_dir)/vpx_ports/mem.h',
+    '<(libvpx_src_dir)/vpx_ports/vpx_timer.h',
+    '<(libvpx_src_dir)/vpx_ports/x86_abi_support.asm',
+    '<(libvpx_src_dir)/vpx_ports/x86_cpuid.c',
+    '<(libvpx_src_dir)/vpx_ports/x86.h',
+    '<(libvpx_src_dir)/vpx_scale/generic/gen_scalers.c',
+    '<(libvpx_src_dir)/vpx_scale/generic/vpxscale.c',
+    '<(libvpx_src_dir)/vpx_scale/generic/yv12config.c',
+    '<(libvpx_src_dir)/vpx_scale/generic/yv12extend.c',
+    '<(libvpx_src_dir)/vpx_scale/generic/yv12extend_generic.h',
+    '<(libvpx_src_dir)/vpx_scale/scale_mode.h',
+    '<(libvpx_src_dir)/vpx_scale/vpxscale.h',
+    '<(libvpx_src_dir)/vpx_scale/yv12config.h',
+    '<(libvpx_src_dir)/vpx/src/vpx_codec.c',
+    '<(libvpx_src_dir)/vpx/src/vpx_decoder.c',
+    '<(libvpx_src_dir)/vpx/src/vpx_encoder.c',
+    '<(libvpx_src_dir)/vpx/src/vpx_image.c',
+    '<(libvpx_src_dir)/vpx/vp8cx.h',
+    '<(libvpx_src_dir)/vpx/vp8dx.h',
+    '<(libvpx_src_dir)/vpx/vp8.h',
+    '<(libvpx_src_dir)/vpx/vpx_codec.h',
+    '<(libvpx_src_dir)/vpx/vpx_codec_impl_bottom.h',
+    '<(libvpx_src_dir)/vpx/vpx_codec_impl_top.h',
+    '<(libvpx_src_dir)/vpx/vpx_decoder.h',
+    '<(libvpx_src_dir)/vpx/vpx_encoder.h',
+    '<(libvpx_src_dir)/vpx/vpx_image.h',
+    '<(libvpx_src_dir)/vpx/vpx_integer.h',
   ],
 }