Update makefiles after merge of Chromium at 279716

This commit was generated by merge_from_chromium.py. Change-Id: I6a4240749bc71690c8d4d857b7c9708452bbe975
author: Android Chromium Automerger <chromium-automerger@android> 2014-06-25 15:10:09 +0000
committer: Android Chromium Automerger <chromium-automerger@android> 2014-06-25 15:10:09 +0000
commit: f15f350f41d56d2317c4c8e0ddbe1126ea3a0daa (patch)
tree: c0a60d29a45f817f3f71256abebf3f0b539b1363
parent: bd92bdeebd4ce09cde7d95a26a58aa7f0bcff570 (diff)
download: libvpx-f15f350f41d56d2317c4c8e0ddbe1126ea3a0daa.tar.gz
56 files changed, 1852 insertions, 386 deletions
diff --git a/gen_asm_offsets_vp8.target.darwin-arm.mk b/gen_asm_offsets_vp8.target.darwin-arm.mk
index ae3c8c2..95c5a7a 100644
--- a/gen_asm_offsets_vp8.target.darwin-arm.mk
+++ b/gen_asm_offsets_vp8.target.darwin-arm.mk
@@ -115,6 +115,7 @@ MY_DEFS_Debug := \
 	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DCLD_DATA_FROM_STATIC' \
 	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
@@ -150,6 +151,9 @@ LOCAL_CPPFLAGS_Debug := \
 	-fvisibility-inlines-hidden \
 	-Wno-deprecated \
 	-Wno-abi \
+	-std=gnu++11 \
+	-Wno-narrowing \
+	-Wno-literal-suffix \
 	-Wno-non-virtual-dtor \
 	-Wno-sign-promo \
 	-Wno-non-virtual-dtor
@@ -215,6 +219,7 @@ MY_DEFS_Release := \
 	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DCLD_DATA_FROM_STATIC' \
 	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
@@ -250,6 +255,9 @@ LOCAL_CPPFLAGS_Release := \
 	-fvisibility-inlines-hidden \
 	-Wno-deprecated \
 	-Wno-abi \
+	-std=gnu++11 \
+	-Wno-narrowing \
+	-Wno-literal-suffix \
 	-Wno-non-virtual-dtor \
 	-Wno-sign-promo \
 	-Wno-non-virtual-dtor
diff --git a/gen_asm_offsets_vp8.target.darwin-arm64.mk b/gen_asm_offsets_vp8.target.darwin-arm64.mk
index 94337e3..31836d5 100644
--- a/gen_asm_offsets_vp8.target.darwin-arm64.mk
+++ b/gen_asm_offsets_vp8.target.darwin-arm64.mk
@@ -105,6 +105,7 @@ MY_DEFS_Debug := \
 	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DCLD_DATA_FROM_STATIC' \
 	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
@@ -139,6 +140,9 @@ LOCAL_CPPFLAGS_Debug := \
 	-fno-threadsafe-statics \
 	-fvisibility-inlines-hidden \
 	-Wno-deprecated \
+	-std=gnu++11 \
+	-Wno-narrowing \
+	-Wno-literal-suffix \
 	-Wno-non-virtual-dtor \
 	-Wno-sign-promo \
 	-Wno-non-virtual-dtor
@@ -194,6 +198,7 @@ MY_DEFS_Release := \
 	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DCLD_DATA_FROM_STATIC' \
 	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
@@ -228,6 +233,9 @@ LOCAL_CPPFLAGS_Release := \
 	-fno-threadsafe-statics \
 	-fvisibility-inlines-hidden \
 	-Wno-deprecated \
+	-std=gnu++11 \
+	-Wno-narrowing \
+	-Wno-literal-suffix \
 	-Wno-non-virtual-dtor \
 	-Wno-sign-promo \
 	-Wno-non-virtual-dtor
diff --git a/gen_asm_offsets_vp8.target.darwin-x86.mk b/gen_asm_offsets_vp8.target.darwin-x86.mk
index 9e3b7f2..d4890f3 100644
--- a/gen_asm_offsets_vp8.target.darwin-x86.mk
+++ b/gen_asm_offsets_vp8.target.darwin-x86.mk
@@ -110,6 +110,7 @@ MY_DEFS_Debug := \
 	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DCLD_DATA_FROM_STATIC' \
 	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
@@ -144,6 +145,9 @@ LOCAL_CPPFLAGS_Debug := \
 	-fno-threadsafe-statics \
 	-fvisibility-inlines-hidden \
 	-Wno-deprecated \
+	-std=gnu++11 \
+	-Wno-narrowing \
+	-Wno-literal-suffix \
 	-Wno-non-virtual-dtor \
 	-Wno-sign-promo \
 	-Wno-non-virtual-dtor
@@ -204,6 +208,7 @@ MY_DEFS_Release := \
 	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DCLD_DATA_FROM_STATIC' \
 	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
@@ -238,6 +243,9 @@ LOCAL_CPPFLAGS_Release := \
 	-fno-threadsafe-statics \
 	-fvisibility-inlines-hidden \
 	-Wno-deprecated \
+	-std=gnu++11 \
+	-Wno-narrowing \
+	-Wno-literal-suffix \
 	-Wno-non-virtual-dtor \
 	-Wno-sign-promo \
 	-Wno-non-virtual-dtor
diff --git a/gen_asm_offsets_vp8.target.darwin-x86_64.mk b/gen_asm_offsets_vp8.target.darwin-x86_64.mk
index 9b1ffa0..488c29e 100644
--- a/gen_asm_offsets_vp8.target.darwin-x86_64.mk
+++ b/gen_asm_offsets_vp8.target.darwin-x86_64.mk
@@ -109,6 +109,7 @@ MY_DEFS_Debug := \
 	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DCLD_DATA_FROM_STATIC' \
 	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
@@ -143,6 +144,9 @@ LOCAL_CPPFLAGS_Debug := \
 	-fno-threadsafe-statics \
 	-fvisibility-inlines-hidden \
 	-Wno-deprecated \
+	-std=gnu++11 \
+	-Wno-narrowing \
+	-Wno-literal-suffix \
 	-Wno-non-virtual-dtor \
 	-Wno-sign-promo \
 	-Wno-non-virtual-dtor
@@ -202,6 +206,7 @@ MY_DEFS_Release := \
 	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DCLD_DATA_FROM_STATIC' \
 	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
@@ -236,6 +241,9 @@ LOCAL_CPPFLAGS_Release := \
 	-fno-threadsafe-statics \
 	-fvisibility-inlines-hidden \
 	-Wno-deprecated \
+	-std=gnu++11 \
+	-Wno-narrowing \
+	-Wno-literal-suffix \
 	-Wno-non-virtual-dtor \
 	-Wno-sign-promo \
 	-Wno-non-virtual-dtor
diff --git a/gen_asm_offsets_vp8.target.linux-arm.mk b/gen_asm_offsets_vp8.target.linux-arm.mk
index ae3c8c2..95c5a7a 100644
--- a/gen_asm_offsets_vp8.target.linux-arm.mk
+++ b/gen_asm_offsets_vp8.target.linux-arm.mk
@@ -115,6 +115,7 @@ MY_DEFS_Debug := \
 	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DCLD_DATA_FROM_STATIC' \
 	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
@@ -150,6 +151,9 @@ LOCAL_CPPFLAGS_Debug := \
 	-fvisibility-inlines-hidden \
 	-Wno-deprecated \
 	-Wno-abi \
+	-std=gnu++11 \
+	-Wno-narrowing \
+	-Wno-literal-suffix \
 	-Wno-non-virtual-dtor \
 	-Wno-sign-promo \
 	-Wno-non-virtual-dtor
@@ -215,6 +219,7 @@ MY_DEFS_Release := \
 	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DCLD_DATA_FROM_STATIC' \
 	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
@@ -250,6 +255,9 @@ LOCAL_CPPFLAGS_Release := \
 	-fvisibility-inlines-hidden \
 	-Wno-deprecated \
 	-Wno-abi \
+	-std=gnu++11 \
+	-Wno-narrowing \
+	-Wno-literal-suffix \
 	-Wno-non-virtual-dtor \
 	-Wno-sign-promo \
 	-Wno-non-virtual-dtor
diff --git a/gen_asm_offsets_vp8.target.linux-arm64.mk b/gen_asm_offsets_vp8.target.linux-arm64.mk
index 94337e3..31836d5 100644
--- a/gen_asm_offsets_vp8.target.linux-arm64.mk
+++ b/gen_asm_offsets_vp8.target.linux-arm64.mk
@@ -105,6 +105,7 @@ MY_DEFS_Debug := \
 	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DCLD_DATA_FROM_STATIC' \
 	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
@@ -139,6 +140,9 @@ LOCAL_CPPFLAGS_Debug := \
 	-fno-threadsafe-statics \
 	-fvisibility-inlines-hidden \
 	-Wno-deprecated \
+	-std=gnu++11 \
+	-Wno-narrowing \
+	-Wno-literal-suffix \
 	-Wno-non-virtual-dtor \
 	-Wno-sign-promo \
 	-Wno-non-virtual-dtor
@@ -194,6 +198,7 @@ MY_DEFS_Release := \
 	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DCLD_DATA_FROM_STATIC' \
 	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
@@ -228,6 +233,9 @@ LOCAL_CPPFLAGS_Release := \
 	-fno-threadsafe-statics \
 	-fvisibility-inlines-hidden \
 	-Wno-deprecated \
+	-std=gnu++11 \
+	-Wno-narrowing \
+	-Wno-literal-suffix \
 	-Wno-non-virtual-dtor \
 	-Wno-sign-promo \
 	-Wno-non-virtual-dtor
diff --git a/gen_asm_offsets_vp8.target.linux-x86.mk b/gen_asm_offsets_vp8.target.linux-x86.mk
index 9e3b7f2..d4890f3 100644
--- a/gen_asm_offsets_vp8.target.linux-x86.mk
+++ b/gen_asm_offsets_vp8.target.linux-x86.mk
@@ -110,6 +110,7 @@ MY_DEFS_Debug := \
 	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DCLD_DATA_FROM_STATIC' \
 	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
@@ -144,6 +145,9 @@ LOCAL_CPPFLAGS_Debug := \
 	-fno-threadsafe-statics \
 	-fvisibility-inlines-hidden \
 	-Wno-deprecated \
+	-std=gnu++11 \
+	-Wno-narrowing \
+	-Wno-literal-suffix \
 	-Wno-non-virtual-dtor \
 	-Wno-sign-promo \
 	-Wno-non-virtual-dtor
@@ -204,6 +208,7 @@ MY_DEFS_Release := \
 	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DCLD_DATA_FROM_STATIC' \
 	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
@@ -238,6 +243,9 @@ LOCAL_CPPFLAGS_Release := \
 	-fno-threadsafe-statics \
 	-fvisibility-inlines-hidden \
 	-Wno-deprecated \
+	-std=gnu++11 \
+	-Wno-narrowing \
+	-Wno-literal-suffix \
 	-Wno-non-virtual-dtor \
 	-Wno-sign-promo \
 	-Wno-non-virtual-dtor
diff --git a/gen_asm_offsets_vp8.target.linux-x86_64.mk b/gen_asm_offsets_vp8.target.linux-x86_64.mk
index 9b1ffa0..488c29e 100644
--- a/gen_asm_offsets_vp8.target.linux-x86_64.mk
+++ b/gen_asm_offsets_vp8.target.linux-x86_64.mk
@@ -109,6 +109,7 @@ MY_DEFS_Debug := \
 	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DCLD_DATA_FROM_STATIC' \
 	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
@@ -143,6 +144,9 @@ LOCAL_CPPFLAGS_Debug := \
 	-fno-threadsafe-statics \
 	-fvisibility-inlines-hidden \
 	-Wno-deprecated \
+	-std=gnu++11 \
+	-Wno-narrowing \
+	-Wno-literal-suffix \
 	-Wno-non-virtual-dtor \
 	-Wno-sign-promo \
 	-Wno-non-virtual-dtor
@@ -202,6 +206,7 @@ MY_DEFS_Release := \
 	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DCLD_DATA_FROM_STATIC' \
 	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
@@ -236,6 +241,9 @@ LOCAL_CPPFLAGS_Release := \
 	-fno-threadsafe-statics \
 	-fvisibility-inlines-hidden \
 	-Wno-deprecated \
+	-std=gnu++11 \
+	-Wno-narrowing \
+	-Wno-literal-suffix \
 	-Wno-non-virtual-dtor \
 	-Wno-sign-promo \
 	-Wno-non-virtual-dtor
diff --git a/gen_asm_offsets_vpx_scale.target.darwin-arm.mk b/gen_asm_offsets_vpx_scale.target.darwin-arm.mk
index 59450ce..ceab559 100644
--- a/gen_asm_offsets_vpx_scale.target.darwin-arm.mk
+++ b/gen_asm_offsets_vpx_scale.target.darwin-arm.mk
@@ -115,6 +115,7 @@ MY_DEFS_Debug := \
 	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DCLD_DATA_FROM_STATIC' \
 	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
@@ -150,6 +151,9 @@ LOCAL_CPPFLAGS_Debug := \
 	-fvisibility-inlines-hidden \
 	-Wno-deprecated \
 	-Wno-abi \
+	-std=gnu++11 \
+	-Wno-narrowing \
+	-Wno-literal-suffix \
 	-Wno-non-virtual-dtor \
 	-Wno-sign-promo \
 	-Wno-non-virtual-dtor
@@ -215,6 +219,7 @@ MY_DEFS_Release := \
 	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DCLD_DATA_FROM_STATIC' \
 	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
@@ -250,6 +255,9 @@ LOCAL_CPPFLAGS_Release := \
 	-fvisibility-inlines-hidden \
 	-Wno-deprecated \
 	-Wno-abi \
+	-std=gnu++11 \
+	-Wno-narrowing \
+	-Wno-literal-suffix \
 	-Wno-non-virtual-dtor \
 	-Wno-sign-promo \
 	-Wno-non-virtual-dtor
diff --git a/gen_asm_offsets_vpx_scale.target.linux-arm.mk b/gen_asm_offsets_vpx_scale.target.linux-arm.mk
index 59450ce..ceab559 100644
--- a/gen_asm_offsets_vpx_scale.target.linux-arm.mk
+++ b/gen_asm_offsets_vpx_scale.target.linux-arm.mk
@@ -115,6 +115,7 @@ MY_DEFS_Debug := \
 	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DCLD_DATA_FROM_STATIC' \
 	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
@@ -150,6 +151,9 @@ LOCAL_CPPFLAGS_Debug := \
 	-fvisibility-inlines-hidden \
 	-Wno-deprecated \
 	-Wno-abi \
+	-std=gnu++11 \
+	-Wno-narrowing \
+	-Wno-literal-suffix \
 	-Wno-non-virtual-dtor \
 	-Wno-sign-promo \
 	-Wno-non-virtual-dtor
@@ -215,6 +219,7 @@ MY_DEFS_Release := \
 	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DCLD_DATA_FROM_STATIC' \
 	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
@@ -250,6 +255,9 @@ LOCAL_CPPFLAGS_Release := \
 	-fvisibility-inlines-hidden \
 	-Wno-deprecated \
 	-Wno-abi \
+	-std=gnu++11 \
+	-Wno-narrowing \
+	-Wno-literal-suffix \
 	-Wno-non-virtual-dtor \
 	-Wno-sign-promo \
 	-Wno-non-virtual-dtor
diff --git a/libvpx.target.darwin-arm.mk b/libvpx.target.darwin-arm.mk
index bc6a763..ee68cc0 100644
--- a/libvpx.target.darwin-arm.mk
+++ b/libvpx.target.darwin-arm.mk
@@ -973,7 +973,6 @@ LOCAL_SRC_FILES := \
 	third_party/libvpx/source/libvpx/vp9/encoder/vp9_writer.c \
 	third_party/libvpx/source/libvpx/vp9/vp9_cx_iface.c \
 	third_party/libvpx/source/libvpx/vp9/vp9_dx_iface.c \
-	third_party/libvpx/source/libvpx/vpx/src/svc_encodeframe.c \
 	third_party/libvpx/source/libvpx/vpx/src/vpx_codec.c \
 	third_party/libvpx/source/libvpx/vpx/src/vpx_decoder.c \
 	third_party/libvpx/source/libvpx/vpx/src/vpx_encoder.c \
@@ -1051,6 +1050,7 @@ MY_DEFS_Debug := \
 	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DCLD_DATA_FROM_STATIC' \
 	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
@@ -1089,6 +1089,9 @@ LOCAL_CPPFLAGS_Debug := \
 	-fvisibility-inlines-hidden \
 	-Wno-deprecated \
 	-Wno-abi \
+	-std=gnu++11 \
+	-Wno-narrowing \
+	-Wno-literal-suffix \
 	-Wno-non-virtual-dtor \
 	-Wno-sign-promo \
 	-Wno-non-virtual-dtor
@@ -1156,6 +1159,7 @@ MY_DEFS_Release := \
 	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DCLD_DATA_FROM_STATIC' \
 	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
@@ -1194,6 +1198,9 @@ LOCAL_CPPFLAGS_Release := \
 	-fvisibility-inlines-hidden \
 	-Wno-deprecated \
 	-Wno-abi \
+	-std=gnu++11 \
+	-Wno-narrowing \
+	-Wno-literal-suffix \
 	-Wno-non-virtual-dtor \
 	-Wno-sign-promo \
 	-Wno-non-virtual-dtor
diff --git a/libvpx.target.darwin-arm64.mk b/libvpx.target.darwin-arm64.mk
index a63484a..4e4ab18 100644
--- a/libvpx.target.darwin-arm64.mk
+++ b/libvpx.target.darwin-arm64.mk
@@ -171,7 +171,6 @@ LOCAL_SRC_FILES := \
 	third_party/libvpx/source/libvpx/vp9/encoder/vp9_writer.c \
 	third_party/libvpx/source/libvpx/vp9/vp9_cx_iface.c \
 	third_party/libvpx/source/libvpx/vp9/vp9_dx_iface.c \
-	third_party/libvpx/source/libvpx/vpx/src/svc_encodeframe.c \
 	third_party/libvpx/source/libvpx/vpx/src/vpx_codec.c \
 	third_party/libvpx/source/libvpx/vpx/src/vpx_decoder.c \
 	third_party/libvpx/source/libvpx/vpx/src/vpx_encoder.c \
@@ -236,6 +235,7 @@ MY_DEFS_Debug := \
 	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DCLD_DATA_FROM_STATIC' \
 	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
@@ -277,6 +277,9 @@ LOCAL_CPPFLAGS_Debug := \
 	-fno-threadsafe-statics \
 	-fvisibility-inlines-hidden \
 	-Wno-deprecated \
+	-std=gnu++11 \
+	-Wno-narrowing \
+	-Wno-literal-suffix \
 	-Wno-non-virtual-dtor \
 	-Wno-sign-promo \
 	-Wno-non-virtual-dtor
@@ -332,6 +335,7 @@ MY_DEFS_Release := \
 	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DCLD_DATA_FROM_STATIC' \
 	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
@@ -373,6 +377,9 @@ LOCAL_CPPFLAGS_Release := \
 	-fno-threadsafe-statics \
 	-fvisibility-inlines-hidden \
 	-Wno-deprecated \
+	-std=gnu++11 \
+	-Wno-narrowing \
+	-Wno-literal-suffix \
 	-Wno-non-virtual-dtor \
 	-Wno-sign-promo \
 	-Wno-non-virtual-dtor
diff --git a/libvpx.target.darwin-mips.mk b/libvpx.target.darwin-mips.mk
index 3e4aeb5..fb2fb13 100644
--- a/libvpx.target.darwin-mips.mk
+++ b/libvpx.target.darwin-mips.mk
@@ -153,7 +153,6 @@ LOCAL_SRC_FILES := \
 	third_party/libvpx/source/libvpx/vp9/encoder/vp9_writer.c \
 	third_party/libvpx/source/libvpx/vp9/vp9_cx_iface.c \
 	third_party/libvpx/source/libvpx/vp9/vp9_dx_iface.c \
-	third_party/libvpx/source/libvpx/vpx/src/svc_encodeframe.c \
 	third_party/libvpx/source/libvpx/vpx/src/vpx_codec.c \
 	third_party/libvpx/source/libvpx/vpx/src/vpx_decoder.c \
 	third_party/libvpx/source/libvpx/vpx/src/vpx_encoder.c \
@@ -222,6 +221,7 @@ MY_DEFS_Debug := \
 	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DCLD_DATA_FROM_STATIC' \
 	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
@@ -263,6 +263,9 @@ LOCAL_CPPFLAGS_Debug := \
 	-fvisibility-inlines-hidden \
 	-Wno-deprecated \
 	-Wno-uninitialized \
+	-std=gnu++11 \
+	-Wno-narrowing \
+	-Wno-literal-suffix \
 	-Wno-non-virtual-dtor \
 	-Wno-sign-promo \
 	-Wno-non-virtual-dtor
@@ -323,6 +326,7 @@ MY_DEFS_Release := \
 	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DCLD_DATA_FROM_STATIC' \
 	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
@@ -364,6 +368,9 @@ LOCAL_CPPFLAGS_Release := \
 	-fvisibility-inlines-hidden \
 	-Wno-deprecated \
 	-Wno-uninitialized \
+	-std=gnu++11 \
+	-Wno-narrowing \
+	-Wno-literal-suffix \
 	-Wno-non-virtual-dtor \
 	-Wno-sign-promo \
 	-Wno-non-virtual-dtor
diff --git a/libvpx.target.darwin-x86.mk b/libvpx.target.darwin-x86.mk
index 405aee2..f52dfff 100644
--- a/libvpx.target.darwin-x86.mk
+++ b/libvpx.target.darwin-x86.mk
@@ -17,14 +17,14 @@ GYP_TARGET_DEPENDENCIES := \
 
 
 ### Generated for rule "third_party_libvpx_libvpx_gyp_libvpx_target_assemble":
-# "{'inputs': ['$(gyp_shared_intermediate_dir)/yasm'], 'extension': 'asm', 'process_outputs_as_sources': '1', 'outputs': ['$(gyp_shared_intermediate_dir)/third_party/libvpx/%(INPUT_ROOT)s.o'], 'rule_name': 'assemble', 'rule_sources': ['source/libvpx/third_party/x86inc/x86inc.asm', 'source/libvpx/vp8/common/x86/dequantize_mmx.asm', '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/mfqe_sse2.asm', 'source/libvpx/vp8/common/x86/postproc_mmx.asm', 'source/libvpx/vp8/common/x86/postproc_sse2.asm', 'source/libvpx/vp8/common/x86/recon_mmx.asm', 'source/libvpx/vp8/common/x86/recon_sse2.asm', '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/encoder/x86/dct_mmx.asm', 'source/libvpx/vp8/encoder/x86/dct_sse2.asm', '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_sse4.asm', 'source/libvpx/vp8/encoder/x86/subtract_mmx.asm', 'source/libvpx/vp8/encoder/x86/subtract_sse2.asm', 'source/libvpx/vp9/common/x86/vp9_copy_sse2.asm', 'source/libvpx/vp9/common/x86/vp9_intrapred_sse2.asm', 'source/libvpx/vp9/common/x86/vp9_intrapred_ssse3.asm', 'source/libvpx/vp9/common/x86/vp9_loopfilter_mmx.asm', 'source/libvpx/vp9/common/x86/vp9_subpixel_8t_sse2.asm', 'source/libvpx/vp9/common/x86/vp9_subpixel_8t_ssse3.asm', 'source/libvpx/vp9/common/x86/vp9_subpixel_bilinear_sse2.asm', 'source/libvpx/vp9/common/x86/vp9_subpixel_bilinear_ssse3.asm', 'source/libvpx/vp9/encoder/x86/vp9_dct_mmx.asm', 'source/libvpx/vp9/encoder/x86/vp9_error_sse2.asm', 'source/libvpx/vp9/encoder/x86/vp9_sad4d_sse2.asm', 'source/libvpx/vp9/encoder/x86/vp9_sad_mmx.asm', 'source/libvpx/vp9/encoder/x86/vp9_sad_sse2.asm', 'source/libvpx/vp9/encoder/x86/vp9_sad_sse3.asm', 'source/libvpx/vp9/encoder/x86/vp9_sad_sse4.asm', 'source/libvpx/vp9/encoder/x86/vp9_sad_ssse3.asm', 'source/libvpx/vp9/encoder/x86/vp9_subpel_variance.asm', 'source/libvpx/vp9/encoder/x86/vp9_subtract_sse2.asm', 'source/libvpx/vp9/encoder/x86/vp9_temporal_filter_apply_sse2.asm', 'source/libvpx/vp9/encoder/x86/vp9_variance_impl_mmx.asm', 'source/libvpx/vp9/encoder/x86/vp9_variance_impl_sse2.asm', 'source/libvpx/vpx_ports/emms.asm', 'source/libvpx/vpx_ports/x86_abi_support.asm'], 'action': ['$(gyp_shared_intermediate_dir)/yasm', '-D', 'CHROMIUM', '-I', 'source/config/linux/ia32', '-I', 'source/config', '-I', 'source/libvpx', '-I', '$(gyp_shared_intermediate_dir)/third_party/libvpx', '-felf32', '-m', 'x86', '-o', '$(gyp_shared_intermediate_dir)/third_party/libvpx/%(INPUT_ROOT)s.o', '$(RULE_SOURCES)'], 'message': 'Compile assembly $(RULE_SOURCES)'}":
+# "{'inputs': ['$(gyp_shared_intermediate_dir)/yasm'], 'extension': 'asm', 'process_outputs_as_sources': '1', 'outputs': ['$(gyp_shared_intermediate_dir)/third_party/libvpx/%(INPUT_ROOT)s.o'], 'rule_name': 'assemble', 'rule_sources': ['source/libvpx/third_party/x86inc/x86inc.asm', 'source/libvpx/vp8/common/x86/dequantize_mmx.asm', '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/mfqe_sse2.asm', 'source/libvpx/vp8/common/x86/postproc_mmx.asm', 'source/libvpx/vp8/common/x86/postproc_sse2.asm', 'source/libvpx/vp8/common/x86/recon_mmx.asm', 'source/libvpx/vp8/common/x86/recon_sse2.asm', '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/encoder/x86/dct_mmx.asm', 'source/libvpx/vp8/encoder/x86/dct_sse2.asm', '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/subtract_mmx.asm', 'source/libvpx/vp8/encoder/x86/subtract_sse2.asm', 'source/libvpx/vp9/common/x86/vp9_copy_sse2.asm', 'source/libvpx/vp9/common/x86/vp9_intrapred_sse2.asm', 'source/libvpx/vp9/common/x86/vp9_intrapred_ssse3.asm', 'source/libvpx/vp9/common/x86/vp9_loopfilter_mmx.asm', 'source/libvpx/vp9/common/x86/vp9_subpixel_8t_sse2.asm', 'source/libvpx/vp9/common/x86/vp9_subpixel_8t_ssse3.asm', 'source/libvpx/vp9/common/x86/vp9_subpixel_bilinear_sse2.asm', 'source/libvpx/vp9/common/x86/vp9_subpixel_bilinear_ssse3.asm', 'source/libvpx/vp9/encoder/x86/vp9_dct_mmx.asm', 'source/libvpx/vp9/encoder/x86/vp9_error_sse2.asm', 'source/libvpx/vp9/encoder/x86/vp9_sad4d_sse2.asm', 'source/libvpx/vp9/encoder/x86/vp9_sad_mmx.asm', 'source/libvpx/vp9/encoder/x86/vp9_sad_sse2.asm', 'source/libvpx/vp9/encoder/x86/vp9_sad_sse3.asm', 'source/libvpx/vp9/encoder/x86/vp9_sad_sse4.asm', 'source/libvpx/vp9/encoder/x86/vp9_sad_ssse3.asm', 'source/libvpx/vp9/encoder/x86/vp9_subpel_variance.asm', 'source/libvpx/vp9/encoder/x86/vp9_subtract_sse2.asm', 'source/libvpx/vp9/encoder/x86/vp9_temporal_filter_apply_sse2.asm', 'source/libvpx/vp9/encoder/x86/vp9_variance_impl_mmx.asm', 'source/libvpx/vp9/encoder/x86/vp9_variance_impl_sse2.asm', 'source/libvpx/vpx_ports/emms.asm', 'source/libvpx/vpx_ports/x86_abi_support.asm'], 'action': ['$(gyp_shared_intermediate_dir)/yasm', '-D', 'CHROMIUM', '-I', 'source/config/linux/ia32', '-I', 'source/config', '-I', 'source/libvpx', '-I', '$(gyp_shared_intermediate_dir)/third_party/libvpx', '-D', '__ANDROID__', '-felf32', '-m', 'x86', '-o', '$(gyp_shared_intermediate_dir)/third_party/libvpx/%(INPUT_ROOT)s.o', '$(RULE_SOURCES)'], 'message': 'Compile assembly $(RULE_SOURCES)'}":
 $(gyp_shared_intermediate_dir)/third_party/libvpx/x86inc.o: gyp_local_path := $(LOCAL_PATH)
 $(gyp_shared_intermediate_dir)/third_party/libvpx/x86inc.o: gyp_var_prefix := $(GYP_VAR_PREFIX)
 $(gyp_shared_intermediate_dir)/third_party/libvpx/x86inc.o: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/x86inc.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/x86inc.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/x86inc.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/third_party/x86inc/x86inc.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/x86inc.o" source/libvpx/third_party/x86inc/x86inc.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/x86inc.o" source/libvpx/third_party/x86inc/x86inc.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/dequantize_mmx.o: gyp_local_path := $(LOCAL_PATH)
@@ -33,7 +33,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/dequantize_mmx.o: gyp_intermed
 $(gyp_shared_intermediate_dir)/third_party/libvpx/dequantize_mmx.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/dequantize_mmx.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/dequantize_mmx.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/common/x86/dequantize_mmx.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/dequantize_mmx.o" source/libvpx/vp8/common/x86/dequantize_mmx.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/dequantize_mmx.o" source/libvpx/vp8/common/x86/dequantize_mmx.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/idctllm_mmx.o: gyp_local_path := $(LOCAL_PATH)
@@ -42,7 +42,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/idctllm_mmx.o: gyp_intermediat
 $(gyp_shared_intermediate_dir)/third_party/libvpx/idctllm_mmx.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/idctllm_mmx.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/idctllm_mmx.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/common/x86/idctllm_mmx.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/idctllm_mmx.o" source/libvpx/vp8/common/x86/idctllm_mmx.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/idctllm_mmx.o" source/libvpx/vp8/common/x86/idctllm_mmx.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/idctllm_sse2.o: gyp_local_path := $(LOCAL_PATH)
@@ -51,7 +51,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/idctllm_sse2.o: gyp_intermedia
 $(gyp_shared_intermediate_dir)/third_party/libvpx/idctllm_sse2.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/idctllm_sse2.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/idctllm_sse2.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/common/x86/idctllm_sse2.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/idctllm_sse2.o" source/libvpx/vp8/common/x86/idctllm_sse2.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/idctllm_sse2.o" source/libvpx/vp8/common/x86/idctllm_sse2.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/iwalsh_mmx.o: gyp_local_path := $(LOCAL_PATH)
@@ -60,7 +60,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/iwalsh_mmx.o: gyp_intermediate
 $(gyp_shared_intermediate_dir)/third_party/libvpx/iwalsh_mmx.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/iwalsh_mmx.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/iwalsh_mmx.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/common/x86/iwalsh_mmx.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/iwalsh_mmx.o" source/libvpx/vp8/common/x86/iwalsh_mmx.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/iwalsh_mmx.o" source/libvpx/vp8/common/x86/iwalsh_mmx.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/iwalsh_sse2.o: gyp_local_path := $(LOCAL_PATH)
@@ -69,7 +69,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/iwalsh_sse2.o: gyp_intermediat
 $(gyp_shared_intermediate_dir)/third_party/libvpx/iwalsh_sse2.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/iwalsh_sse2.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/iwalsh_sse2.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/common/x86/iwalsh_sse2.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/iwalsh_sse2.o" source/libvpx/vp8/common/x86/iwalsh_sse2.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/iwalsh_sse2.o" source/libvpx/vp8/common/x86/iwalsh_sse2.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/loopfilter_mmx.o: gyp_local_path := $(LOCAL_PATH)
@@ -78,7 +78,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/loopfilter_mmx.o: gyp_intermed
 $(gyp_shared_intermediate_dir)/third_party/libvpx/loopfilter_mmx.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/loopfilter_mmx.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/loopfilter_mmx.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/common/x86/loopfilter_mmx.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/loopfilter_mmx.o" source/libvpx/vp8/common/x86/loopfilter_mmx.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/loopfilter_mmx.o" source/libvpx/vp8/common/x86/loopfilter_mmx.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/loopfilter_sse2.o: gyp_local_path := $(LOCAL_PATH)
@@ -87,7 +87,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/loopfilter_sse2.o: gyp_interme
 $(gyp_shared_intermediate_dir)/third_party/libvpx/loopfilter_sse2.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/loopfilter_sse2.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/loopfilter_sse2.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/common/x86/loopfilter_sse2.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/loopfilter_sse2.o" source/libvpx/vp8/common/x86/loopfilter_sse2.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/loopfilter_sse2.o" source/libvpx/vp8/common/x86/loopfilter_sse2.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/mfqe_sse2.o: gyp_local_path := $(LOCAL_PATH)
@@ -96,7 +96,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/mfqe_sse2.o: gyp_intermediate_
 $(gyp_shared_intermediate_dir)/third_party/libvpx/mfqe_sse2.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/mfqe_sse2.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/mfqe_sse2.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/common/x86/mfqe_sse2.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/mfqe_sse2.o" source/libvpx/vp8/common/x86/mfqe_sse2.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/mfqe_sse2.o" source/libvpx/vp8/common/x86/mfqe_sse2.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/postproc_mmx.o: gyp_local_path := $(LOCAL_PATH)
@@ -105,7 +105,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/postproc_mmx.o: gyp_intermedia
 $(gyp_shared_intermediate_dir)/third_party/libvpx/postproc_mmx.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/postproc_mmx.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/postproc_mmx.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/common/x86/postproc_mmx.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/postproc_mmx.o" source/libvpx/vp8/common/x86/postproc_mmx.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/postproc_mmx.o" source/libvpx/vp8/common/x86/postproc_mmx.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/postproc_sse2.o: gyp_local_path := $(LOCAL_PATH)
@@ -114,7 +114,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/postproc_sse2.o: gyp_intermedi
 $(gyp_shared_intermediate_dir)/third_party/libvpx/postproc_sse2.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/postproc_sse2.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/postproc_sse2.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/common/x86/postproc_sse2.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/postproc_sse2.o" source/libvpx/vp8/common/x86/postproc_sse2.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/postproc_sse2.o" source/libvpx/vp8/common/x86/postproc_sse2.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/recon_mmx.o: gyp_local_path := $(LOCAL_PATH)
@@ -123,7 +123,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/recon_mmx.o: gyp_intermediate_
 $(gyp_shared_intermediate_dir)/third_party/libvpx/recon_mmx.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/recon_mmx.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/recon_mmx.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/common/x86/recon_mmx.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/recon_mmx.o" source/libvpx/vp8/common/x86/recon_mmx.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/recon_mmx.o" source/libvpx/vp8/common/x86/recon_mmx.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/recon_sse2.o: gyp_local_path := $(LOCAL_PATH)
@@ -132,7 +132,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/recon_sse2.o: gyp_intermediate
 $(gyp_shared_intermediate_dir)/third_party/libvpx/recon_sse2.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/recon_sse2.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/recon_sse2.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/common/x86/recon_sse2.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/recon_sse2.o" source/libvpx/vp8/common/x86/recon_sse2.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/recon_sse2.o" source/libvpx/vp8/common/x86/recon_sse2.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/sad_mmx.o: gyp_local_path := $(LOCAL_PATH)
@@ -141,7 +141,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/sad_mmx.o: gyp_intermediate_di
 $(gyp_shared_intermediate_dir)/third_party/libvpx/sad_mmx.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/sad_mmx.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/sad_mmx.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/common/x86/sad_mmx.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/sad_mmx.o" source/libvpx/vp8/common/x86/sad_mmx.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/sad_mmx.o" source/libvpx/vp8/common/x86/sad_mmx.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/sad_sse2.o: gyp_local_path := $(LOCAL_PATH)
@@ -150,7 +150,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/sad_sse2.o: gyp_intermediate_d
 $(gyp_shared_intermediate_dir)/third_party/libvpx/sad_sse2.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/sad_sse2.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/sad_sse2.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/common/x86/sad_sse2.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/sad_sse2.o" source/libvpx/vp8/common/x86/sad_sse2.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/sad_sse2.o" source/libvpx/vp8/common/x86/sad_sse2.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/sad_sse3.o: gyp_local_path := $(LOCAL_PATH)
@@ -159,7 +159,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/sad_sse3.o: gyp_intermediate_d
 $(gyp_shared_intermediate_dir)/third_party/libvpx/sad_sse3.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/sad_sse3.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/sad_sse3.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/common/x86/sad_sse3.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/sad_sse3.o" source/libvpx/vp8/common/x86/sad_sse3.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/sad_sse3.o" source/libvpx/vp8/common/x86/sad_sse3.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/sad_sse4.o: gyp_local_path := $(LOCAL_PATH)
@@ -168,7 +168,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/sad_sse4.o: gyp_intermediate_d
 $(gyp_shared_intermediate_dir)/third_party/libvpx/sad_sse4.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/sad_sse4.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/sad_sse4.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/common/x86/sad_sse4.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/sad_sse4.o" source/libvpx/vp8/common/x86/sad_sse4.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/sad_sse4.o" source/libvpx/vp8/common/x86/sad_sse4.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/sad_ssse3.o: gyp_local_path := $(LOCAL_PATH)
@@ -177,7 +177,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/sad_ssse3.o: gyp_intermediate_
 $(gyp_shared_intermediate_dir)/third_party/libvpx/sad_ssse3.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/sad_ssse3.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/sad_ssse3.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/common/x86/sad_ssse3.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/sad_ssse3.o" source/libvpx/vp8/common/x86/sad_ssse3.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/sad_ssse3.o" source/libvpx/vp8/common/x86/sad_ssse3.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/subpixel_mmx.o: gyp_local_path := $(LOCAL_PATH)
@@ -186,7 +186,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/subpixel_mmx.o: gyp_intermedia
 $(gyp_shared_intermediate_dir)/third_party/libvpx/subpixel_mmx.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/subpixel_mmx.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/subpixel_mmx.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/common/x86/subpixel_mmx.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/subpixel_mmx.o" source/libvpx/vp8/common/x86/subpixel_mmx.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/subpixel_mmx.o" source/libvpx/vp8/common/x86/subpixel_mmx.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/subpixel_sse2.o: gyp_local_path := $(LOCAL_PATH)
@@ -195,7 +195,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/subpixel_sse2.o: gyp_intermedi
 $(gyp_shared_intermediate_dir)/third_party/libvpx/subpixel_sse2.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/subpixel_sse2.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/subpixel_sse2.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/common/x86/subpixel_sse2.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/subpixel_sse2.o" source/libvpx/vp8/common/x86/subpixel_sse2.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/subpixel_sse2.o" source/libvpx/vp8/common/x86/subpixel_sse2.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/subpixel_ssse3.o: gyp_local_path := $(LOCAL_PATH)
@@ -204,7 +204,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/subpixel_ssse3.o: gyp_intermed
 $(gyp_shared_intermediate_dir)/third_party/libvpx/subpixel_ssse3.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/subpixel_ssse3.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/subpixel_ssse3.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/common/x86/subpixel_ssse3.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/subpixel_ssse3.o" source/libvpx/vp8/common/x86/subpixel_ssse3.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/subpixel_ssse3.o" source/libvpx/vp8/common/x86/subpixel_ssse3.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/variance_impl_mmx.o: gyp_local_path := $(LOCAL_PATH)
@@ -213,7 +213,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/variance_impl_mmx.o: gyp_inter
 $(gyp_shared_intermediate_dir)/third_party/libvpx/variance_impl_mmx.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/variance_impl_mmx.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/variance_impl_mmx.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/common/x86/variance_impl_mmx.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/variance_impl_mmx.o" source/libvpx/vp8/common/x86/variance_impl_mmx.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/variance_impl_mmx.o" source/libvpx/vp8/common/x86/variance_impl_mmx.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/variance_impl_sse2.o: gyp_local_path := $(LOCAL_PATH)
@@ -222,7 +222,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/variance_impl_sse2.o: gyp_inte
 $(gyp_shared_intermediate_dir)/third_party/libvpx/variance_impl_sse2.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/variance_impl_sse2.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/variance_impl_sse2.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/common/x86/variance_impl_sse2.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/variance_impl_sse2.o" source/libvpx/vp8/common/x86/variance_impl_sse2.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/variance_impl_sse2.o" source/libvpx/vp8/common/x86/variance_impl_sse2.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/variance_impl_ssse3.o: gyp_local_path := $(LOCAL_PATH)
@@ -231,7 +231,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/variance_impl_ssse3.o: gyp_int
 $(gyp_shared_intermediate_dir)/third_party/libvpx/variance_impl_ssse3.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/variance_impl_ssse3.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/variance_impl_ssse3.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/common/x86/variance_impl_ssse3.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/variance_impl_ssse3.o" source/libvpx/vp8/common/x86/variance_impl_ssse3.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/variance_impl_ssse3.o" source/libvpx/vp8/common/x86/variance_impl_ssse3.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/dct_mmx.o: gyp_local_path := $(LOCAL_PATH)
@@ -240,7 +240,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/dct_mmx.o: gyp_intermediate_di
 $(gyp_shared_intermediate_dir)/third_party/libvpx/dct_mmx.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/dct_mmx.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/dct_mmx.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/encoder/x86/dct_mmx.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/dct_mmx.o" source/libvpx/vp8/encoder/x86/dct_mmx.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/dct_mmx.o" source/libvpx/vp8/encoder/x86/dct_mmx.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/dct_sse2.o: gyp_local_path := $(LOCAL_PATH)
@@ -249,7 +249,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/dct_sse2.o: gyp_intermediate_d
 $(gyp_shared_intermediate_dir)/third_party/libvpx/dct_sse2.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/dct_sse2.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/dct_sse2.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/encoder/x86/dct_sse2.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/dct_sse2.o" source/libvpx/vp8/encoder/x86/dct_sse2.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/dct_sse2.o" source/libvpx/vp8/encoder/x86/dct_sse2.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/encodeopt.o: gyp_local_path := $(LOCAL_PATH)
@@ -258,7 +258,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/encodeopt.o: gyp_intermediate_
 $(gyp_shared_intermediate_dir)/third_party/libvpx/encodeopt.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/encodeopt.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/encodeopt.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/encoder/x86/encodeopt.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/encodeopt.o" source/libvpx/vp8/encoder/x86/encodeopt.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/encodeopt.o" source/libvpx/vp8/encoder/x86/encodeopt.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/fwalsh_sse2.o: gyp_local_path := $(LOCAL_PATH)
@@ -267,7 +267,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/fwalsh_sse2.o: gyp_intermediat
 $(gyp_shared_intermediate_dir)/third_party/libvpx/fwalsh_sse2.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/fwalsh_sse2.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/fwalsh_sse2.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/encoder/x86/fwalsh_sse2.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/fwalsh_sse2.o" source/libvpx/vp8/encoder/x86/fwalsh_sse2.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/fwalsh_sse2.o" source/libvpx/vp8/encoder/x86/fwalsh_sse2.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/quantize_mmx.o: gyp_local_path := $(LOCAL_PATH)
@@ -276,16 +276,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/quantize_mmx.o: gyp_intermedia
 $(gyp_shared_intermediate_dir)/third_party/libvpx/quantize_mmx.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/quantize_mmx.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/quantize_mmx.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/encoder/x86/quantize_mmx.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/quantize_mmx.o" source/libvpx/vp8/encoder/x86/quantize_mmx.asm
-
-
-$(gyp_shared_intermediate_dir)/third_party/libvpx/quantize_sse4.o: gyp_local_path := $(LOCAL_PATH)
-$(gyp_shared_intermediate_dir)/third_party/libvpx/quantize_sse4.o: gyp_var_prefix := $(GYP_VAR_PREFIX)
-$(gyp_shared_intermediate_dir)/third_party/libvpx/quantize_sse4.o: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir))
-$(gyp_shared_intermediate_dir)/third_party/libvpx/quantize_sse4.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
-$(gyp_shared_intermediate_dir)/third_party/libvpx/quantize_sse4.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
-$(gyp_shared_intermediate_dir)/third_party/libvpx/quantize_sse4.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/encoder/x86/quantize_sse4.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/quantize_sse4.o" source/libvpx/vp8/encoder/x86/quantize_sse4.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/quantize_mmx.o" source/libvpx/vp8/encoder/x86/quantize_mmx.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/subtract_mmx.o: gyp_local_path := $(LOCAL_PATH)
@@ -294,7 +285,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/subtract_mmx.o: gyp_intermedia
 $(gyp_shared_intermediate_dir)/third_party/libvpx/subtract_mmx.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/subtract_mmx.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/subtract_mmx.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/encoder/x86/subtract_mmx.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/subtract_mmx.o" source/libvpx/vp8/encoder/x86/subtract_mmx.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/subtract_mmx.o" source/libvpx/vp8/encoder/x86/subtract_mmx.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/subtract_sse2.o: gyp_local_path := $(LOCAL_PATH)
@@ -303,7 +294,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/subtract_sse2.o: gyp_intermedi
 $(gyp_shared_intermediate_dir)/third_party/libvpx/subtract_sse2.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/subtract_sse2.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/subtract_sse2.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/encoder/x86/subtract_sse2.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/subtract_sse2.o" source/libvpx/vp8/encoder/x86/subtract_sse2.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/subtract_sse2.o" source/libvpx/vp8/encoder/x86/subtract_sse2.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_copy_sse2.o: gyp_local_path := $(LOCAL_PATH)
@@ -312,7 +303,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_copy_sse2.o: gyp_intermedi
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_copy_sse2.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_copy_sse2.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_copy_sse2.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp9/common/x86/vp9_copy_sse2.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_copy_sse2.o" source/libvpx/vp9/common/x86/vp9_copy_sse2.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_copy_sse2.o" source/libvpx/vp9/common/x86/vp9_copy_sse2.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_intrapred_sse2.o: gyp_local_path := $(LOCAL_PATH)
@@ -321,7 +312,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_intrapred_sse2.o: gyp_inte
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_intrapred_sse2.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_intrapred_sse2.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_intrapred_sse2.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp9/common/x86/vp9_intrapred_sse2.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_intrapred_sse2.o" source/libvpx/vp9/common/x86/vp9_intrapred_sse2.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_intrapred_sse2.o" source/libvpx/vp9/common/x86/vp9_intrapred_sse2.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_intrapred_ssse3.o: gyp_local_path := $(LOCAL_PATH)
@@ -330,7 +321,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_intrapred_ssse3.o: gyp_int
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_intrapred_ssse3.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_intrapred_ssse3.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_intrapred_ssse3.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp9/common/x86/vp9_intrapred_ssse3.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_intrapred_ssse3.o" source/libvpx/vp9/common/x86/vp9_intrapred_ssse3.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_intrapred_ssse3.o" source/libvpx/vp9/common/x86/vp9_intrapred_ssse3.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_loopfilter_mmx.o: gyp_local_path := $(LOCAL_PATH)
@@ -339,7 +330,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_loopfilter_mmx.o: gyp_inte
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_loopfilter_mmx.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_loopfilter_mmx.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_loopfilter_mmx.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp9/common/x86/vp9_loopfilter_mmx.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_loopfilter_mmx.o" source/libvpx/vp9/common/x86/vp9_loopfilter_mmx.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_loopfilter_mmx.o" source/libvpx/vp9/common/x86/vp9_loopfilter_mmx.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_8t_sse2.o: gyp_local_path := $(LOCAL_PATH)
@@ -348,7 +339,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_8t_sse2.o: gyp_in
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_8t_sse2.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_8t_sse2.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_8t_sse2.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp9/common/x86/vp9_subpixel_8t_sse2.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_8t_sse2.o" source/libvpx/vp9/common/x86/vp9_subpixel_8t_sse2.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_8t_sse2.o" source/libvpx/vp9/common/x86/vp9_subpixel_8t_sse2.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_8t_ssse3.o: gyp_local_path := $(LOCAL_PATH)
@@ -357,7 +348,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_8t_ssse3.o: gyp_i
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_8t_ssse3.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_8t_ssse3.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_8t_ssse3.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp9/common/x86/vp9_subpixel_8t_ssse3.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_8t_ssse3.o" source/libvpx/vp9/common/x86/vp9_subpixel_8t_ssse3.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_8t_ssse3.o" source/libvpx/vp9/common/x86/vp9_subpixel_8t_ssse3.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_bilinear_sse2.o: gyp_local_path := $(LOCAL_PATH)
@@ -366,7 +357,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_bilinear_sse2.o:
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_bilinear_sse2.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_bilinear_sse2.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_bilinear_sse2.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp9/common/x86/vp9_subpixel_bilinear_sse2.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_bilinear_sse2.o" source/libvpx/vp9/common/x86/vp9_subpixel_bilinear_sse2.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_bilinear_sse2.o" source/libvpx/vp9/common/x86/vp9_subpixel_bilinear_sse2.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_bilinear_ssse3.o: gyp_local_path := $(LOCAL_PATH)
@@ -375,7 +366,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_bilinear_ssse3.o:
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_bilinear_ssse3.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_bilinear_ssse3.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_bilinear_ssse3.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp9/common/x86/vp9_subpixel_bilinear_ssse3.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_bilinear_ssse3.o" source/libvpx/vp9/common/x86/vp9_subpixel_bilinear_ssse3.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_bilinear_ssse3.o" source/libvpx/vp9/common/x86/vp9_subpixel_bilinear_ssse3.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_dct_mmx.o: gyp_local_path := $(LOCAL_PATH)
@@ -384,7 +375,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_dct_mmx.o: gyp_intermediat
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_dct_mmx.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_dct_mmx.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_dct_mmx.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_dct_mmx.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_dct_mmx.o" source/libvpx/vp9/encoder/x86/vp9_dct_mmx.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_dct_mmx.o" source/libvpx/vp9/encoder/x86/vp9_dct_mmx.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_error_sse2.o: gyp_local_path := $(LOCAL_PATH)
@@ -393,7 +384,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_error_sse2.o: gyp_intermed
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_error_sse2.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_error_sse2.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_error_sse2.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_error_sse2.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_error_sse2.o" source/libvpx/vp9/encoder/x86/vp9_error_sse2.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_error_sse2.o" source/libvpx/vp9/encoder/x86/vp9_error_sse2.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad4d_sse2.o: gyp_local_path := $(LOCAL_PATH)
@@ -402,7 +393,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad4d_sse2.o: gyp_intermed
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad4d_sse2.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad4d_sse2.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad4d_sse2.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_sad4d_sse2.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad4d_sse2.o" source/libvpx/vp9/encoder/x86/vp9_sad4d_sse2.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad4d_sse2.o" source/libvpx/vp9/encoder/x86/vp9_sad4d_sse2.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_mmx.o: gyp_local_path := $(LOCAL_PATH)
@@ -411,7 +402,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_mmx.o: gyp_intermediat
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_mmx.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_mmx.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_mmx.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_sad_mmx.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_mmx.o" source/libvpx/vp9/encoder/x86/vp9_sad_mmx.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_mmx.o" source/libvpx/vp9/encoder/x86/vp9_sad_mmx.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_sse2.o: gyp_local_path := $(LOCAL_PATH)
@@ -420,7 +411,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_sse2.o: gyp_intermedia
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_sse2.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_sse2.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_sse2.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_sad_sse2.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_sse2.o" source/libvpx/vp9/encoder/x86/vp9_sad_sse2.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_sse2.o" source/libvpx/vp9/encoder/x86/vp9_sad_sse2.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_sse3.o: gyp_local_path := $(LOCAL_PATH)
@@ -429,7 +420,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_sse3.o: gyp_intermedia
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_sse3.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_sse3.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_sse3.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_sad_sse3.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_sse3.o" source/libvpx/vp9/encoder/x86/vp9_sad_sse3.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_sse3.o" source/libvpx/vp9/encoder/x86/vp9_sad_sse3.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_sse4.o: gyp_local_path := $(LOCAL_PATH)
@@ -438,7 +429,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_sse4.o: gyp_intermedia
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_sse4.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_sse4.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_sse4.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_sad_sse4.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_sse4.o" source/libvpx/vp9/encoder/x86/vp9_sad_sse4.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_sse4.o" source/libvpx/vp9/encoder/x86/vp9_sad_sse4.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_ssse3.o: gyp_local_path := $(LOCAL_PATH)
@@ -447,7 +438,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_ssse3.o: gyp_intermedi
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_ssse3.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_ssse3.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_ssse3.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_sad_ssse3.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_ssse3.o" source/libvpx/vp9/encoder/x86/vp9_sad_ssse3.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_ssse3.o" source/libvpx/vp9/encoder/x86/vp9_sad_ssse3.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpel_variance.o: gyp_local_path := $(LOCAL_PATH)
@@ -456,7 +447,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpel_variance.o: gyp_int
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpel_variance.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpel_variance.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpel_variance.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_subpel_variance.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpel_variance.o" source/libvpx/vp9/encoder/x86/vp9_subpel_variance.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpel_variance.o" source/libvpx/vp9/encoder/x86/vp9_subpel_variance.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subtract_sse2.o: gyp_local_path := $(LOCAL_PATH)
@@ -465,7 +456,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subtract_sse2.o: gyp_inter
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subtract_sse2.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subtract_sse2.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subtract_sse2.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_subtract_sse2.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subtract_sse2.o" source/libvpx/vp9/encoder/x86/vp9_subtract_sse2.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subtract_sse2.o" source/libvpx/vp9/encoder/x86/vp9_subtract_sse2.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_temporal_filter_apply_sse2.o: gyp_local_path := $(LOCAL_PATH)
@@ -474,7 +465,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_temporal_filter_apply_sse2
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_temporal_filter_apply_sse2.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_temporal_filter_apply_sse2.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_temporal_filter_apply_sse2.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_temporal_filter_apply_sse2.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_temporal_filter_apply_sse2.o" source/libvpx/vp9/encoder/x86/vp9_temporal_filter_apply_sse2.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_temporal_filter_apply_sse2.o" source/libvpx/vp9/encoder/x86/vp9_temporal_filter_apply_sse2.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_variance_impl_mmx.o: gyp_local_path := $(LOCAL_PATH)
@@ -483,7 +474,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_variance_impl_mmx.o: gyp_i
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_variance_impl_mmx.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_variance_impl_mmx.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_variance_impl_mmx.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_variance_impl_mmx.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_variance_impl_mmx.o" source/libvpx/vp9/encoder/x86/vp9_variance_impl_mmx.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_variance_impl_mmx.o" source/libvpx/vp9/encoder/x86/vp9_variance_impl_mmx.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_variance_impl_sse2.o: gyp_local_path := $(LOCAL_PATH)
@@ -492,7 +483,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_variance_impl_sse2.o: gyp_
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_variance_impl_sse2.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_variance_impl_sse2.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_variance_impl_sse2.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_variance_impl_sse2.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_variance_impl_sse2.o" source/libvpx/vp9/encoder/x86/vp9_variance_impl_sse2.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_variance_impl_sse2.o" source/libvpx/vp9/encoder/x86/vp9_variance_impl_sse2.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/emms.o: gyp_local_path := $(LOCAL_PATH)
@@ -501,7 +492,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/emms.o: gyp_intermediate_dir :
 $(gyp_shared_intermediate_dir)/third_party/libvpx/emms.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/emms.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/emms.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vpx_ports/emms.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/emms.o" source/libvpx/vpx_ports/emms.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/emms.o" source/libvpx/vpx_ports/emms.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/x86_abi_support.o: gyp_local_path := $(LOCAL_PATH)
@@ -510,7 +501,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/x86_abi_support.o: gyp_interme
 $(gyp_shared_intermediate_dir)/third_party/libvpx/x86_abi_support.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/x86_abi_support.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/x86_abi_support.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vpx_ports/x86_abi_support.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/x86_abi_support.o" source/libvpx/vpx_ports/x86_abi_support.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/x86_abi_support.o" source/libvpx/vpx_ports/x86_abi_support.asm
 
 
 
@@ -544,7 +535,6 @@ GYP_GENERATED_OUTPUTS := \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/encodeopt.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/fwalsh_sse2.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/quantize_mmx.o \
-	$(gyp_shared_intermediate_dir)/third_party/libvpx/quantize_sse4.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/subtract_mmx.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/subtract_sse2.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_copy_sse2.o \
@@ -604,7 +594,6 @@ LOCAL_GENERATED_SOURCES := \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/encodeopt.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/fwalsh_sse2.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/quantize_mmx.o \
-	$(gyp_shared_intermediate_dir)/third_party/libvpx/quantize_sse4.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/subtract_mmx.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/subtract_sse2.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_copy_sse2.o \
@@ -665,7 +654,6 @@ LOCAL_SRC_FILES := \
 	third_party/libvpx/source/libvpx/vp8/common/variance_c.c \
 	third_party/libvpx/source/libvpx/vp8/common/x86/filter_x86.c \
 	third_party/libvpx/source/libvpx/vp8/common/x86/loopfilter_x86.c \
-	third_party/libvpx/source/libvpx/vp8/common/x86/postproc_x86.c \
 	third_party/libvpx/source/libvpx/vp8/common/x86/vp8_asm_stubs.c \
 	third_party/libvpx/source/libvpx/vp8/decoder/dboolhuff.c \
 	third_party/libvpx/source/libvpx/vp8/decoder/decodeframe.c \
@@ -766,7 +754,6 @@ LOCAL_SRC_FILES := \
 	third_party/libvpx/source/libvpx/vp9/encoder/vp9_writer.c \
 	third_party/libvpx/source/libvpx/vp9/vp9_cx_iface.c \
 	third_party/libvpx/source/libvpx/vp9/vp9_dx_iface.c \
-	third_party/libvpx/source/libvpx/vpx/src/svc_encodeframe.c \
 	third_party/libvpx/source/libvpx/vpx/src/vpx_codec.c \
 	third_party/libvpx/source/libvpx/vpx/src/vpx_decoder.c \
 	third_party/libvpx/source/libvpx/vpx/src/vpx_encoder.c \
@@ -835,6 +822,7 @@ MY_DEFS_Debug := \
 	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DCLD_DATA_FROM_STATIC' \
 	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
@@ -876,6 +864,9 @@ LOCAL_CPPFLAGS_Debug := \
 	-fno-threadsafe-statics \
 	-fvisibility-inlines-hidden \
 	-Wno-deprecated \
+	-std=gnu++11 \
+	-Wno-narrowing \
+	-Wno-literal-suffix \
 	-Wno-non-virtual-dtor \
 	-Wno-sign-promo \
 	-Wno-non-virtual-dtor
@@ -936,6 +927,7 @@ MY_DEFS_Release := \
 	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DCLD_DATA_FROM_STATIC' \
 	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
@@ -977,6 +969,9 @@ LOCAL_CPPFLAGS_Release := \
 	-fno-threadsafe-statics \
 	-fvisibility-inlines-hidden \
 	-Wno-deprecated \
+	-std=gnu++11 \
+	-Wno-narrowing \
+	-Wno-literal-suffix \
 	-Wno-non-virtual-dtor \
 	-Wno-sign-promo \
 	-Wno-non-virtual-dtor
diff --git a/libvpx.target.darwin-x86_64.mk b/libvpx.target.darwin-x86_64.mk
index 7ed0f6f..abd45a1 100644
--- a/libvpx.target.darwin-x86_64.mk
+++ b/libvpx.target.darwin-x86_64.mk
@@ -17,14 +17,14 @@ GYP_TARGET_DEPENDENCIES := \
 
 
 ### Generated for rule "third_party_libvpx_libvpx_gyp_libvpx_target_assemble":
-# "{'inputs': ['$(gyp_shared_intermediate_dir)/yasm'], 'extension': 'asm', 'process_outputs_as_sources': '1', 'outputs': ['$(gyp_shared_intermediate_dir)/third_party/libvpx/%(INPUT_ROOT)s.o'], 'rule_name': 'assemble', 'rule_sources': ['source/libvpx/third_party/x86inc/x86inc.asm', 'source/libvpx/vp8/common/x86/dequantize_mmx.asm', '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/mfqe_sse2.asm', 'source/libvpx/vp8/common/x86/postproc_mmx.asm', 'source/libvpx/vp8/common/x86/postproc_sse2.asm', 'source/libvpx/vp8/common/x86/recon_mmx.asm', 'source/libvpx/vp8/common/x86/recon_sse2.asm', '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/encoder/x86/dct_mmx.asm', 'source/libvpx/vp8/encoder/x86/dct_sse2.asm', '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_sse4.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/vp9/common/x86/vp9_copy_sse2.asm', 'source/libvpx/vp9/common/x86/vp9_idct_ssse3.asm', 'source/libvpx/vp9/common/x86/vp9_intrapred_sse2.asm', 'source/libvpx/vp9/common/x86/vp9_intrapred_ssse3.asm', 'source/libvpx/vp9/common/x86/vp9_loopfilter_mmx.asm', 'source/libvpx/vp9/common/x86/vp9_subpixel_8t_sse2.asm', 'source/libvpx/vp9/common/x86/vp9_subpixel_8t_ssse3.asm', 'source/libvpx/vp9/common/x86/vp9_subpixel_bilinear_sse2.asm', 'source/libvpx/vp9/common/x86/vp9_subpixel_bilinear_ssse3.asm', 'source/libvpx/vp9/encoder/x86/vp9_dct_mmx.asm', 'source/libvpx/vp9/encoder/x86/vp9_dct_ssse3.asm', 'source/libvpx/vp9/encoder/x86/vp9_error_sse2.asm', 'source/libvpx/vp9/encoder/x86/vp9_quantize_ssse3.asm', 'source/libvpx/vp9/encoder/x86/vp9_sad4d_sse2.asm', 'source/libvpx/vp9/encoder/x86/vp9_sad_mmx.asm', 'source/libvpx/vp9/encoder/x86/vp9_sad_sse2.asm', 'source/libvpx/vp9/encoder/x86/vp9_sad_sse3.asm', 'source/libvpx/vp9/encoder/x86/vp9_sad_sse4.asm', 'source/libvpx/vp9/encoder/x86/vp9_sad_ssse3.asm', 'source/libvpx/vp9/encoder/x86/vp9_ssim_opt.asm', 'source/libvpx/vp9/encoder/x86/vp9_subpel_variance.asm', 'source/libvpx/vp9/encoder/x86/vp9_subtract_sse2.asm', 'source/libvpx/vp9/encoder/x86/vp9_temporal_filter_apply_sse2.asm', 'source/libvpx/vp9/encoder/x86/vp9_variance_impl_mmx.asm', 'source/libvpx/vp9/encoder/x86/vp9_variance_impl_sse2.asm', 'source/libvpx/vpx_ports/emms.asm', 'source/libvpx/vpx_ports/x86_abi_support.asm'], 'action': ['$(gyp_shared_intermediate_dir)/yasm', '-D', 'CHROMIUM', '-I', 'source/config/linux/x64', '-I', 'source/config', '-I', 'source/libvpx', '-I', '$(gyp_shared_intermediate_dir)/third_party/libvpx', '-DPIC', '-felf64', '-m', 'amd64', '-o', '$(gyp_shared_intermediate_dir)/third_party/libvpx/%(INPUT_ROOT)s.o', '$(RULE_SOURCES)'], 'message': 'Compile assembly $(RULE_SOURCES)'}":
+# "{'inputs': ['$(gyp_shared_intermediate_dir)/yasm'], 'extension': 'asm', 'process_outputs_as_sources': '1', 'outputs': ['$(gyp_shared_intermediate_dir)/third_party/libvpx/%(INPUT_ROOT)s.o'], 'rule_name': 'assemble', 'rule_sources': ['source/libvpx/third_party/x86inc/x86inc.asm', 'source/libvpx/vp8/common/x86/dequantize_mmx.asm', '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_x86_64.asm', 'source/libvpx/vp8/common/x86/loopfilter_mmx.asm', 'source/libvpx/vp8/common/x86/loopfilter_sse2.asm', '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/recon_mmx.asm', 'source/libvpx/vp8/common/x86/recon_sse2.asm', '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/encoder/x86/dct_mmx.asm', 'source/libvpx/vp8/encoder/x86/dct_sse2.asm', '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/ssim_opt_x86_64.asm', 'source/libvpx/vp8/encoder/x86/subtract_mmx.asm', 'source/libvpx/vp8/encoder/x86/subtract_sse2.asm', 'source/libvpx/vp9/common/x86/vp9_copy_sse2.asm', 'source/libvpx/vp9/common/x86/vp9_idct_ssse3_x86_64.asm', 'source/libvpx/vp9/common/x86/vp9_intrapred_sse2.asm', 'source/libvpx/vp9/common/x86/vp9_intrapred_ssse3.asm', 'source/libvpx/vp9/common/x86/vp9_loopfilter_mmx.asm', 'source/libvpx/vp9/common/x86/vp9_subpixel_8t_sse2.asm', 'source/libvpx/vp9/common/x86/vp9_subpixel_8t_ssse3.asm', 'source/libvpx/vp9/common/x86/vp9_subpixel_bilinear_sse2.asm', 'source/libvpx/vp9/common/x86/vp9_subpixel_bilinear_ssse3.asm', 'source/libvpx/vp9/encoder/x86/vp9_dct_mmx.asm', 'source/libvpx/vp9/encoder/x86/vp9_dct_ssse3_x86_64.asm', 'source/libvpx/vp9/encoder/x86/vp9_error_sse2.asm', 'source/libvpx/vp9/encoder/x86/vp9_quantize_ssse3_x86_64.asm', 'source/libvpx/vp9/encoder/x86/vp9_sad4d_sse2.asm', 'source/libvpx/vp9/encoder/x86/vp9_sad_mmx.asm', 'source/libvpx/vp9/encoder/x86/vp9_sad_sse2.asm', 'source/libvpx/vp9/encoder/x86/vp9_sad_sse3.asm', 'source/libvpx/vp9/encoder/x86/vp9_sad_sse4.asm', 'source/libvpx/vp9/encoder/x86/vp9_sad_ssse3.asm', 'source/libvpx/vp9/encoder/x86/vp9_ssim_opt_x86_64.asm', 'source/libvpx/vp9/encoder/x86/vp9_subpel_variance.asm', 'source/libvpx/vp9/encoder/x86/vp9_subtract_sse2.asm', 'source/libvpx/vp9/encoder/x86/vp9_temporal_filter_apply_sse2.asm', 'source/libvpx/vp9/encoder/x86/vp9_variance_impl_mmx.asm', 'source/libvpx/vp9/encoder/x86/vp9_variance_impl_sse2.asm', 'source/libvpx/vpx_ports/emms.asm', 'source/libvpx/vpx_ports/x86_abi_support.asm'], 'action': ['$(gyp_shared_intermediate_dir)/yasm', '-D', 'CHROMIUM', '-I', 'source/config/linux/x64', '-I', 'source/config', '-I', 'source/libvpx', '-I', '$(gyp_shared_intermediate_dir)/third_party/libvpx', '-D', '__ANDROID__', '-DPIC', '-felf64', '-m', 'amd64', '-o', '$(gyp_shared_intermediate_dir)/third_party/libvpx/%(INPUT_ROOT)s.o', '$(RULE_SOURCES)'], 'message': 'Compile assembly $(RULE_SOURCES)'}":
 $(gyp_shared_intermediate_dir)/third_party/libvpx/x86inc.o: gyp_local_path := $(LOCAL_PATH)
 $(gyp_shared_intermediate_dir)/third_party/libvpx/x86inc.o: gyp_var_prefix := $(GYP_VAR_PREFIX)
 $(gyp_shared_intermediate_dir)/third_party/libvpx/x86inc.o: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/x86inc.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/x86inc.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/x86inc.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/third_party/x86inc/x86inc.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/x86inc.o" source/libvpx/third_party/x86inc/x86inc.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/x86inc.o" source/libvpx/third_party/x86inc/x86inc.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/dequantize_mmx.o: gyp_local_path := $(LOCAL_PATH)
@@ -33,7 +33,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/dequantize_mmx.o: gyp_intermed
 $(gyp_shared_intermediate_dir)/third_party/libvpx/dequantize_mmx.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/dequantize_mmx.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/dequantize_mmx.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/common/x86/dequantize_mmx.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/dequantize_mmx.o" source/libvpx/vp8/common/x86/dequantize_mmx.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/dequantize_mmx.o" source/libvpx/vp8/common/x86/dequantize_mmx.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/idctllm_mmx.o: gyp_local_path := $(LOCAL_PATH)
@@ -42,7 +42,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/idctllm_mmx.o: gyp_intermediat
 $(gyp_shared_intermediate_dir)/third_party/libvpx/idctllm_mmx.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/idctllm_mmx.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/idctllm_mmx.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/common/x86/idctllm_mmx.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/idctllm_mmx.o" source/libvpx/vp8/common/x86/idctllm_mmx.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/idctllm_mmx.o" source/libvpx/vp8/common/x86/idctllm_mmx.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/idctllm_sse2.o: gyp_local_path := $(LOCAL_PATH)
@@ -51,7 +51,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/idctllm_sse2.o: gyp_intermedia
 $(gyp_shared_intermediate_dir)/third_party/libvpx/idctllm_sse2.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/idctllm_sse2.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/idctllm_sse2.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/common/x86/idctllm_sse2.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/idctllm_sse2.o" source/libvpx/vp8/common/x86/idctllm_sse2.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/idctllm_sse2.o" source/libvpx/vp8/common/x86/idctllm_sse2.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/iwalsh_mmx.o: gyp_local_path := $(LOCAL_PATH)
@@ -60,7 +60,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/iwalsh_mmx.o: gyp_intermediate
 $(gyp_shared_intermediate_dir)/third_party/libvpx/iwalsh_mmx.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/iwalsh_mmx.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/iwalsh_mmx.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/common/x86/iwalsh_mmx.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/iwalsh_mmx.o" source/libvpx/vp8/common/x86/iwalsh_mmx.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/iwalsh_mmx.o" source/libvpx/vp8/common/x86/iwalsh_mmx.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/iwalsh_sse2.o: gyp_local_path := $(LOCAL_PATH)
@@ -69,16 +69,16 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/iwalsh_sse2.o: gyp_intermediat
 $(gyp_shared_intermediate_dir)/third_party/libvpx/iwalsh_sse2.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/iwalsh_sse2.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/iwalsh_sse2.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/common/x86/iwalsh_sse2.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/iwalsh_sse2.o" source/libvpx/vp8/common/x86/iwalsh_sse2.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/iwalsh_sse2.o" source/libvpx/vp8/common/x86/iwalsh_sse2.asm
 
 
-$(gyp_shared_intermediate_dir)/third_party/libvpx/loopfilter_block_sse2.o: gyp_local_path := $(LOCAL_PATH)
-$(gyp_shared_intermediate_dir)/third_party/libvpx/loopfilter_block_sse2.o: gyp_var_prefix := $(GYP_VAR_PREFIX)
-$(gyp_shared_intermediate_dir)/third_party/libvpx/loopfilter_block_sse2.o: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir))
-$(gyp_shared_intermediate_dir)/third_party/libvpx/loopfilter_block_sse2.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
-$(gyp_shared_intermediate_dir)/third_party/libvpx/loopfilter_block_sse2.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
-$(gyp_shared_intermediate_dir)/third_party/libvpx/loopfilter_block_sse2.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/common/x86/loopfilter_block_sse2.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/loopfilter_block_sse2.o" source/libvpx/vp8/common/x86/loopfilter_block_sse2.asm
+$(gyp_shared_intermediate_dir)/third_party/libvpx/loopfilter_block_sse2_x86_64.o: gyp_local_path := $(LOCAL_PATH)
+$(gyp_shared_intermediate_dir)/third_party/libvpx/loopfilter_block_sse2_x86_64.o: gyp_var_prefix := $(GYP_VAR_PREFIX)
+$(gyp_shared_intermediate_dir)/third_party/libvpx/loopfilter_block_sse2_x86_64.o: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir))
+$(gyp_shared_intermediate_dir)/third_party/libvpx/loopfilter_block_sse2_x86_64.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
+$(gyp_shared_intermediate_dir)/third_party/libvpx/loopfilter_block_sse2_x86_64.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
+$(gyp_shared_intermediate_dir)/third_party/libvpx/loopfilter_block_sse2_x86_64.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/common/x86/loopfilter_block_sse2_x86_64.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/loopfilter_block_sse2_x86_64.o" source/libvpx/vp8/common/x86/loopfilter_block_sse2_x86_64.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/loopfilter_mmx.o: gyp_local_path := $(LOCAL_PATH)
@@ -87,7 +87,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/loopfilter_mmx.o: gyp_intermed
 $(gyp_shared_intermediate_dir)/third_party/libvpx/loopfilter_mmx.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/loopfilter_mmx.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/loopfilter_mmx.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/common/x86/loopfilter_mmx.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/loopfilter_mmx.o" source/libvpx/vp8/common/x86/loopfilter_mmx.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/loopfilter_mmx.o" source/libvpx/vp8/common/x86/loopfilter_mmx.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/loopfilter_sse2.o: gyp_local_path := $(LOCAL_PATH)
@@ -96,7 +96,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/loopfilter_sse2.o: gyp_interme
 $(gyp_shared_intermediate_dir)/third_party/libvpx/loopfilter_sse2.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/loopfilter_sse2.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/loopfilter_sse2.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/common/x86/loopfilter_sse2.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/loopfilter_sse2.o" source/libvpx/vp8/common/x86/loopfilter_sse2.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/loopfilter_sse2.o" source/libvpx/vp8/common/x86/loopfilter_sse2.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/mfqe_sse2.o: gyp_local_path := $(LOCAL_PATH)
@@ -105,7 +105,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/mfqe_sse2.o: gyp_intermediate_
 $(gyp_shared_intermediate_dir)/third_party/libvpx/mfqe_sse2.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/mfqe_sse2.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/mfqe_sse2.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/common/x86/mfqe_sse2.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/mfqe_sse2.o" source/libvpx/vp8/common/x86/mfqe_sse2.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/mfqe_sse2.o" source/libvpx/vp8/common/x86/mfqe_sse2.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/postproc_mmx.o: gyp_local_path := $(LOCAL_PATH)
@@ -114,7 +114,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/postproc_mmx.o: gyp_intermedia
 $(gyp_shared_intermediate_dir)/third_party/libvpx/postproc_mmx.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/postproc_mmx.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/postproc_mmx.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/common/x86/postproc_mmx.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/postproc_mmx.o" source/libvpx/vp8/common/x86/postproc_mmx.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/postproc_mmx.o" source/libvpx/vp8/common/x86/postproc_mmx.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/postproc_sse2.o: gyp_local_path := $(LOCAL_PATH)
@@ -123,7 +123,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/postproc_sse2.o: gyp_intermedi
 $(gyp_shared_intermediate_dir)/third_party/libvpx/postproc_sse2.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/postproc_sse2.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/postproc_sse2.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/common/x86/postproc_sse2.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/postproc_sse2.o" source/libvpx/vp8/common/x86/postproc_sse2.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/postproc_sse2.o" source/libvpx/vp8/common/x86/postproc_sse2.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/recon_mmx.o: gyp_local_path := $(LOCAL_PATH)
@@ -132,7 +132,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/recon_mmx.o: gyp_intermediate_
 $(gyp_shared_intermediate_dir)/third_party/libvpx/recon_mmx.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/recon_mmx.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/recon_mmx.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/common/x86/recon_mmx.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/recon_mmx.o" source/libvpx/vp8/common/x86/recon_mmx.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/recon_mmx.o" source/libvpx/vp8/common/x86/recon_mmx.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/recon_sse2.o: gyp_local_path := $(LOCAL_PATH)
@@ -141,7 +141,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/recon_sse2.o: gyp_intermediate
 $(gyp_shared_intermediate_dir)/third_party/libvpx/recon_sse2.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/recon_sse2.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/recon_sse2.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/common/x86/recon_sse2.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/recon_sse2.o" source/libvpx/vp8/common/x86/recon_sse2.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/recon_sse2.o" source/libvpx/vp8/common/x86/recon_sse2.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/sad_mmx.o: gyp_local_path := $(LOCAL_PATH)
@@ -150,7 +150,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/sad_mmx.o: gyp_intermediate_di
 $(gyp_shared_intermediate_dir)/third_party/libvpx/sad_mmx.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/sad_mmx.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/sad_mmx.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/common/x86/sad_mmx.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/sad_mmx.o" source/libvpx/vp8/common/x86/sad_mmx.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/sad_mmx.o" source/libvpx/vp8/common/x86/sad_mmx.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/sad_sse2.o: gyp_local_path := $(LOCAL_PATH)
@@ -159,7 +159,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/sad_sse2.o: gyp_intermediate_d
 $(gyp_shared_intermediate_dir)/third_party/libvpx/sad_sse2.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/sad_sse2.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/sad_sse2.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/common/x86/sad_sse2.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/sad_sse2.o" source/libvpx/vp8/common/x86/sad_sse2.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/sad_sse2.o" source/libvpx/vp8/common/x86/sad_sse2.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/sad_sse3.o: gyp_local_path := $(LOCAL_PATH)
@@ -168,7 +168,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/sad_sse3.o: gyp_intermediate_d
 $(gyp_shared_intermediate_dir)/third_party/libvpx/sad_sse3.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/sad_sse3.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/sad_sse3.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/common/x86/sad_sse3.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/sad_sse3.o" source/libvpx/vp8/common/x86/sad_sse3.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/sad_sse3.o" source/libvpx/vp8/common/x86/sad_sse3.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/sad_sse4.o: gyp_local_path := $(LOCAL_PATH)
@@ -177,7 +177,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/sad_sse4.o: gyp_intermediate_d
 $(gyp_shared_intermediate_dir)/third_party/libvpx/sad_sse4.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/sad_sse4.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/sad_sse4.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/common/x86/sad_sse4.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/sad_sse4.o" source/libvpx/vp8/common/x86/sad_sse4.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/sad_sse4.o" source/libvpx/vp8/common/x86/sad_sse4.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/sad_ssse3.o: gyp_local_path := $(LOCAL_PATH)
@@ -186,7 +186,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/sad_ssse3.o: gyp_intermediate_
 $(gyp_shared_intermediate_dir)/third_party/libvpx/sad_ssse3.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/sad_ssse3.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/sad_ssse3.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/common/x86/sad_ssse3.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/sad_ssse3.o" source/libvpx/vp8/common/x86/sad_ssse3.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/sad_ssse3.o" source/libvpx/vp8/common/x86/sad_ssse3.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/subpixel_mmx.o: gyp_local_path := $(LOCAL_PATH)
@@ -195,7 +195,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/subpixel_mmx.o: gyp_intermedia
 $(gyp_shared_intermediate_dir)/third_party/libvpx/subpixel_mmx.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/subpixel_mmx.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/subpixel_mmx.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/common/x86/subpixel_mmx.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/subpixel_mmx.o" source/libvpx/vp8/common/x86/subpixel_mmx.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/subpixel_mmx.o" source/libvpx/vp8/common/x86/subpixel_mmx.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/subpixel_sse2.o: gyp_local_path := $(LOCAL_PATH)
@@ -204,7 +204,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/subpixel_sse2.o: gyp_intermedi
 $(gyp_shared_intermediate_dir)/third_party/libvpx/subpixel_sse2.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/subpixel_sse2.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/subpixel_sse2.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/common/x86/subpixel_sse2.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/subpixel_sse2.o" source/libvpx/vp8/common/x86/subpixel_sse2.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/subpixel_sse2.o" source/libvpx/vp8/common/x86/subpixel_sse2.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/subpixel_ssse3.o: gyp_local_path := $(LOCAL_PATH)
@@ -213,7 +213,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/subpixel_ssse3.o: gyp_intermed
 $(gyp_shared_intermediate_dir)/third_party/libvpx/subpixel_ssse3.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/subpixel_ssse3.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/subpixel_ssse3.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/common/x86/subpixel_ssse3.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/subpixel_ssse3.o" source/libvpx/vp8/common/x86/subpixel_ssse3.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/subpixel_ssse3.o" source/libvpx/vp8/common/x86/subpixel_ssse3.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/variance_impl_mmx.o: gyp_local_path := $(LOCAL_PATH)
@@ -222,7 +222,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/variance_impl_mmx.o: gyp_inter
 $(gyp_shared_intermediate_dir)/third_party/libvpx/variance_impl_mmx.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/variance_impl_mmx.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/variance_impl_mmx.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/common/x86/variance_impl_mmx.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/variance_impl_mmx.o" source/libvpx/vp8/common/x86/variance_impl_mmx.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/variance_impl_mmx.o" source/libvpx/vp8/common/x86/variance_impl_mmx.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/variance_impl_sse2.o: gyp_local_path := $(LOCAL_PATH)
@@ -231,7 +231,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/variance_impl_sse2.o: gyp_inte
 $(gyp_shared_intermediate_dir)/third_party/libvpx/variance_impl_sse2.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/variance_impl_sse2.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/variance_impl_sse2.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/common/x86/variance_impl_sse2.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/variance_impl_sse2.o" source/libvpx/vp8/common/x86/variance_impl_sse2.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/variance_impl_sse2.o" source/libvpx/vp8/common/x86/variance_impl_sse2.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/variance_impl_ssse3.o: gyp_local_path := $(LOCAL_PATH)
@@ -240,7 +240,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/variance_impl_ssse3.o: gyp_int
 $(gyp_shared_intermediate_dir)/third_party/libvpx/variance_impl_ssse3.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/variance_impl_ssse3.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/variance_impl_ssse3.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/common/x86/variance_impl_ssse3.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/variance_impl_ssse3.o" source/libvpx/vp8/common/x86/variance_impl_ssse3.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/variance_impl_ssse3.o" source/libvpx/vp8/common/x86/variance_impl_ssse3.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/dct_mmx.o: gyp_local_path := $(LOCAL_PATH)
@@ -249,7 +249,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/dct_mmx.o: gyp_intermediate_di
 $(gyp_shared_intermediate_dir)/third_party/libvpx/dct_mmx.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/dct_mmx.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/dct_mmx.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/encoder/x86/dct_mmx.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/dct_mmx.o" source/libvpx/vp8/encoder/x86/dct_mmx.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/dct_mmx.o" source/libvpx/vp8/encoder/x86/dct_mmx.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/dct_sse2.o: gyp_local_path := $(LOCAL_PATH)
@@ -258,7 +258,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/dct_sse2.o: gyp_intermediate_d
 $(gyp_shared_intermediate_dir)/third_party/libvpx/dct_sse2.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/dct_sse2.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/dct_sse2.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/encoder/x86/dct_sse2.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/dct_sse2.o" source/libvpx/vp8/encoder/x86/dct_sse2.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/dct_sse2.o" source/libvpx/vp8/encoder/x86/dct_sse2.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/encodeopt.o: gyp_local_path := $(LOCAL_PATH)
@@ -267,7 +267,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/encodeopt.o: gyp_intermediate_
 $(gyp_shared_intermediate_dir)/third_party/libvpx/encodeopt.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/encodeopt.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/encodeopt.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/encoder/x86/encodeopt.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/encodeopt.o" source/libvpx/vp8/encoder/x86/encodeopt.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/encodeopt.o" source/libvpx/vp8/encoder/x86/encodeopt.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/fwalsh_sse2.o: gyp_local_path := $(LOCAL_PATH)
@@ -276,7 +276,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/fwalsh_sse2.o: gyp_intermediat
 $(gyp_shared_intermediate_dir)/third_party/libvpx/fwalsh_sse2.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/fwalsh_sse2.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/fwalsh_sse2.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/encoder/x86/fwalsh_sse2.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/fwalsh_sse2.o" source/libvpx/vp8/encoder/x86/fwalsh_sse2.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/fwalsh_sse2.o" source/libvpx/vp8/encoder/x86/fwalsh_sse2.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/quantize_mmx.o: gyp_local_path := $(LOCAL_PATH)
@@ -285,25 +285,16 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/quantize_mmx.o: gyp_intermedia
 $(gyp_shared_intermediate_dir)/third_party/libvpx/quantize_mmx.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/quantize_mmx.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/quantize_mmx.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/encoder/x86/quantize_mmx.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/quantize_mmx.o" source/libvpx/vp8/encoder/x86/quantize_mmx.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/quantize_mmx.o" source/libvpx/vp8/encoder/x86/quantize_mmx.asm
 
 
-$(gyp_shared_intermediate_dir)/third_party/libvpx/quantize_sse4.o: gyp_local_path := $(LOCAL_PATH)
-$(gyp_shared_intermediate_dir)/third_party/libvpx/quantize_sse4.o: gyp_var_prefix := $(GYP_VAR_PREFIX)
-$(gyp_shared_intermediate_dir)/third_party/libvpx/quantize_sse4.o: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir))
-$(gyp_shared_intermediate_dir)/third_party/libvpx/quantize_sse4.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
-$(gyp_shared_intermediate_dir)/third_party/libvpx/quantize_sse4.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
-$(gyp_shared_intermediate_dir)/third_party/libvpx/quantize_sse4.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/encoder/x86/quantize_sse4.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/quantize_sse4.o" source/libvpx/vp8/encoder/x86/quantize_sse4.asm
-
-
-$(gyp_shared_intermediate_dir)/third_party/libvpx/ssim_opt.o: gyp_local_path := $(LOCAL_PATH)
-$(gyp_shared_intermediate_dir)/third_party/libvpx/ssim_opt.o: gyp_var_prefix := $(GYP_VAR_PREFIX)
-$(gyp_shared_intermediate_dir)/third_party/libvpx/ssim_opt.o: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir))
-$(gyp_shared_intermediate_dir)/third_party/libvpx/ssim_opt.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
-$(gyp_shared_intermediate_dir)/third_party/libvpx/ssim_opt.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
-$(gyp_shared_intermediate_dir)/third_party/libvpx/ssim_opt.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/encoder/x86/ssim_opt.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/ssim_opt.o" source/libvpx/vp8/encoder/x86/ssim_opt.asm
+$(gyp_shared_intermediate_dir)/third_party/libvpx/ssim_opt_x86_64.o: gyp_local_path := $(LOCAL_PATH)
+$(gyp_shared_intermediate_dir)/third_party/libvpx/ssim_opt_x86_64.o: gyp_var_prefix := $(GYP_VAR_PREFIX)
+$(gyp_shared_intermediate_dir)/third_party/libvpx/ssim_opt_x86_64.o: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir))
+$(gyp_shared_intermediate_dir)/third_party/libvpx/ssim_opt_x86_64.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
+$(gyp_shared_intermediate_dir)/third_party/libvpx/ssim_opt_x86_64.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
+$(gyp_shared_intermediate_dir)/third_party/libvpx/ssim_opt_x86_64.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/encoder/x86/ssim_opt_x86_64.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/ssim_opt_x86_64.o" source/libvpx/vp8/encoder/x86/ssim_opt_x86_64.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/subtract_mmx.o: gyp_local_path := $(LOCAL_PATH)
@@ -312,7 +303,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/subtract_mmx.o: gyp_intermedia
 $(gyp_shared_intermediate_dir)/third_party/libvpx/subtract_mmx.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/subtract_mmx.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/subtract_mmx.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/encoder/x86/subtract_mmx.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/subtract_mmx.o" source/libvpx/vp8/encoder/x86/subtract_mmx.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/subtract_mmx.o" source/libvpx/vp8/encoder/x86/subtract_mmx.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/subtract_sse2.o: gyp_local_path := $(LOCAL_PATH)
@@ -321,7 +312,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/subtract_sse2.o: gyp_intermedi
 $(gyp_shared_intermediate_dir)/third_party/libvpx/subtract_sse2.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/subtract_sse2.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/subtract_sse2.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/encoder/x86/subtract_sse2.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/subtract_sse2.o" source/libvpx/vp8/encoder/x86/subtract_sse2.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/subtract_sse2.o" source/libvpx/vp8/encoder/x86/subtract_sse2.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_copy_sse2.o: gyp_local_path := $(LOCAL_PATH)
@@ -330,16 +321,16 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_copy_sse2.o: gyp_intermedi
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_copy_sse2.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_copy_sse2.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_copy_sse2.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp9/common/x86/vp9_copy_sse2.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_copy_sse2.o" source/libvpx/vp9/common/x86/vp9_copy_sse2.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_copy_sse2.o" source/libvpx/vp9/common/x86/vp9_copy_sse2.asm
 
 
-$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_idct_ssse3.o: gyp_local_path := $(LOCAL_PATH)
-$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_idct_ssse3.o: gyp_var_prefix := $(GYP_VAR_PREFIX)
-$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_idct_ssse3.o: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir))
-$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_idct_ssse3.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
-$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_idct_ssse3.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
-$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_idct_ssse3.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp9/common/x86/vp9_idct_ssse3.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_idct_ssse3.o" source/libvpx/vp9/common/x86/vp9_idct_ssse3.asm
+$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_idct_ssse3_x86_64.o: gyp_local_path := $(LOCAL_PATH)
+$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_idct_ssse3_x86_64.o: gyp_var_prefix := $(GYP_VAR_PREFIX)
+$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_idct_ssse3_x86_64.o: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir))
+$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_idct_ssse3_x86_64.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
+$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_idct_ssse3_x86_64.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
+$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_idct_ssse3_x86_64.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp9/common/x86/vp9_idct_ssse3_x86_64.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_idct_ssse3_x86_64.o" source/libvpx/vp9/common/x86/vp9_idct_ssse3_x86_64.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_intrapred_sse2.o: gyp_local_path := $(LOCAL_PATH)
@@ -348,7 +339,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_intrapred_sse2.o: gyp_inte
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_intrapred_sse2.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_intrapred_sse2.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_intrapred_sse2.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp9/common/x86/vp9_intrapred_sse2.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_intrapred_sse2.o" source/libvpx/vp9/common/x86/vp9_intrapred_sse2.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_intrapred_sse2.o" source/libvpx/vp9/common/x86/vp9_intrapred_sse2.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_intrapred_ssse3.o: gyp_local_path := $(LOCAL_PATH)
@@ -357,7 +348,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_intrapred_ssse3.o: gyp_int
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_intrapred_ssse3.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_intrapred_ssse3.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_intrapred_ssse3.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp9/common/x86/vp9_intrapred_ssse3.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_intrapred_ssse3.o" source/libvpx/vp9/common/x86/vp9_intrapred_ssse3.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_intrapred_ssse3.o" source/libvpx/vp9/common/x86/vp9_intrapred_ssse3.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_loopfilter_mmx.o: gyp_local_path := $(LOCAL_PATH)
@@ -366,7 +357,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_loopfilter_mmx.o: gyp_inte
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_loopfilter_mmx.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_loopfilter_mmx.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_loopfilter_mmx.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp9/common/x86/vp9_loopfilter_mmx.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_loopfilter_mmx.o" source/libvpx/vp9/common/x86/vp9_loopfilter_mmx.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_loopfilter_mmx.o" source/libvpx/vp9/common/x86/vp9_loopfilter_mmx.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_8t_sse2.o: gyp_local_path := $(LOCAL_PATH)
@@ -375,7 +366,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_8t_sse2.o: gyp_in
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_8t_sse2.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_8t_sse2.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_8t_sse2.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp9/common/x86/vp9_subpixel_8t_sse2.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_8t_sse2.o" source/libvpx/vp9/common/x86/vp9_subpixel_8t_sse2.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_8t_sse2.o" source/libvpx/vp9/common/x86/vp9_subpixel_8t_sse2.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_8t_ssse3.o: gyp_local_path := $(LOCAL_PATH)
@@ -384,7 +375,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_8t_ssse3.o: gyp_i
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_8t_ssse3.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_8t_ssse3.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_8t_ssse3.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp9/common/x86/vp9_subpixel_8t_ssse3.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_8t_ssse3.o" source/libvpx/vp9/common/x86/vp9_subpixel_8t_ssse3.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_8t_ssse3.o" source/libvpx/vp9/common/x86/vp9_subpixel_8t_ssse3.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_bilinear_sse2.o: gyp_local_path := $(LOCAL_PATH)
@@ -393,7 +384,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_bilinear_sse2.o:
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_bilinear_sse2.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_bilinear_sse2.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_bilinear_sse2.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp9/common/x86/vp9_subpixel_bilinear_sse2.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_bilinear_sse2.o" source/libvpx/vp9/common/x86/vp9_subpixel_bilinear_sse2.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_bilinear_sse2.o" source/libvpx/vp9/common/x86/vp9_subpixel_bilinear_sse2.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_bilinear_ssse3.o: gyp_local_path := $(LOCAL_PATH)
@@ -402,7 +393,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_bilinear_ssse3.o:
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_bilinear_ssse3.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_bilinear_ssse3.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_bilinear_ssse3.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp9/common/x86/vp9_subpixel_bilinear_ssse3.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_bilinear_ssse3.o" source/libvpx/vp9/common/x86/vp9_subpixel_bilinear_ssse3.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_bilinear_ssse3.o" source/libvpx/vp9/common/x86/vp9_subpixel_bilinear_ssse3.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_dct_mmx.o: gyp_local_path := $(LOCAL_PATH)
@@ -411,16 +402,16 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_dct_mmx.o: gyp_intermediat
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_dct_mmx.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_dct_mmx.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_dct_mmx.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_dct_mmx.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_dct_mmx.o" source/libvpx/vp9/encoder/x86/vp9_dct_mmx.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_dct_mmx.o" source/libvpx/vp9/encoder/x86/vp9_dct_mmx.asm
 
 
-$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_dct_ssse3.o: gyp_local_path := $(LOCAL_PATH)
-$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_dct_ssse3.o: gyp_var_prefix := $(GYP_VAR_PREFIX)
-$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_dct_ssse3.o: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir))
-$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_dct_ssse3.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
-$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_dct_ssse3.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
-$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_dct_ssse3.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_dct_ssse3.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_dct_ssse3.o" source/libvpx/vp9/encoder/x86/vp9_dct_ssse3.asm
+$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_dct_ssse3_x86_64.o: gyp_local_path := $(LOCAL_PATH)
+$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_dct_ssse3_x86_64.o: gyp_var_prefix := $(GYP_VAR_PREFIX)
+$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_dct_ssse3_x86_64.o: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir))
+$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_dct_ssse3_x86_64.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
+$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_dct_ssse3_x86_64.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
+$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_dct_ssse3_x86_64.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_dct_ssse3_x86_64.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_dct_ssse3_x86_64.o" source/libvpx/vp9/encoder/x86/vp9_dct_ssse3_x86_64.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_error_sse2.o: gyp_local_path := $(LOCAL_PATH)
@@ -429,16 +420,16 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_error_sse2.o: gyp_intermed
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_error_sse2.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_error_sse2.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_error_sse2.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_error_sse2.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_error_sse2.o" source/libvpx/vp9/encoder/x86/vp9_error_sse2.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_error_sse2.o" source/libvpx/vp9/encoder/x86/vp9_error_sse2.asm
 
 
-$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_quantize_ssse3.o: gyp_local_path := $(LOCAL_PATH)
-$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_quantize_ssse3.o: gyp_var_prefix := $(GYP_VAR_PREFIX)
-$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_quantize_ssse3.o: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir))
-$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_quantize_ssse3.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
-$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_quantize_ssse3.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
-$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_quantize_ssse3.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_quantize_ssse3.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_quantize_ssse3.o" source/libvpx/vp9/encoder/x86/vp9_quantize_ssse3.asm
+$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_quantize_ssse3_x86_64.o: gyp_local_path := $(LOCAL_PATH)
+$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_quantize_ssse3_x86_64.o: gyp_var_prefix := $(GYP_VAR_PREFIX)
+$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_quantize_ssse3_x86_64.o: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir))
+$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_quantize_ssse3_x86_64.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
+$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_quantize_ssse3_x86_64.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
+$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_quantize_ssse3_x86_64.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_quantize_ssse3_x86_64.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_quantize_ssse3_x86_64.o" source/libvpx/vp9/encoder/x86/vp9_quantize_ssse3_x86_64.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad4d_sse2.o: gyp_local_path := $(LOCAL_PATH)
@@ -447,7 +438,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad4d_sse2.o: gyp_intermed
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad4d_sse2.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad4d_sse2.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad4d_sse2.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_sad4d_sse2.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad4d_sse2.o" source/libvpx/vp9/encoder/x86/vp9_sad4d_sse2.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad4d_sse2.o" source/libvpx/vp9/encoder/x86/vp9_sad4d_sse2.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_mmx.o: gyp_local_path := $(LOCAL_PATH)
@@ -456,7 +447,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_mmx.o: gyp_intermediat
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_mmx.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_mmx.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_mmx.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_sad_mmx.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_mmx.o" source/libvpx/vp9/encoder/x86/vp9_sad_mmx.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_mmx.o" source/libvpx/vp9/encoder/x86/vp9_sad_mmx.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_sse2.o: gyp_local_path := $(LOCAL_PATH)
@@ -465,7 +456,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_sse2.o: gyp_intermedia
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_sse2.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_sse2.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_sse2.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_sad_sse2.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_sse2.o" source/libvpx/vp9/encoder/x86/vp9_sad_sse2.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_sse2.o" source/libvpx/vp9/encoder/x86/vp9_sad_sse2.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_sse3.o: gyp_local_path := $(LOCAL_PATH)
@@ -474,7 +465,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_sse3.o: gyp_intermedia
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_sse3.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_sse3.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_sse3.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_sad_sse3.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_sse3.o" source/libvpx/vp9/encoder/x86/vp9_sad_sse3.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_sse3.o" source/libvpx/vp9/encoder/x86/vp9_sad_sse3.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_sse4.o: gyp_local_path := $(LOCAL_PATH)
@@ -483,7 +474,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_sse4.o: gyp_intermedia
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_sse4.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_sse4.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_sse4.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_sad_sse4.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_sse4.o" source/libvpx/vp9/encoder/x86/vp9_sad_sse4.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_sse4.o" source/libvpx/vp9/encoder/x86/vp9_sad_sse4.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_ssse3.o: gyp_local_path := $(LOCAL_PATH)
@@ -492,16 +483,16 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_ssse3.o: gyp_intermedi
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_ssse3.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_ssse3.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_ssse3.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_sad_ssse3.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_ssse3.o" source/libvpx/vp9/encoder/x86/vp9_sad_ssse3.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_ssse3.o" source/libvpx/vp9/encoder/x86/vp9_sad_ssse3.asm
 
 
-$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_ssim_opt.o: gyp_local_path := $(LOCAL_PATH)
-$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_ssim_opt.o: gyp_var_prefix := $(GYP_VAR_PREFIX)
-$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_ssim_opt.o: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir))
-$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_ssim_opt.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
-$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_ssim_opt.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
-$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_ssim_opt.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_ssim_opt.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_ssim_opt.o" source/libvpx/vp9/encoder/x86/vp9_ssim_opt.asm
+$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_ssim_opt_x86_64.o: gyp_local_path := $(LOCAL_PATH)
+$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_ssim_opt_x86_64.o: gyp_var_prefix := $(GYP_VAR_PREFIX)
+$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_ssim_opt_x86_64.o: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir))
+$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_ssim_opt_x86_64.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
+$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_ssim_opt_x86_64.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
+$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_ssim_opt_x86_64.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_ssim_opt_x86_64.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_ssim_opt_x86_64.o" source/libvpx/vp9/encoder/x86/vp9_ssim_opt_x86_64.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpel_variance.o: gyp_local_path := $(LOCAL_PATH)
@@ -510,7 +501,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpel_variance.o: gyp_int
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpel_variance.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpel_variance.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpel_variance.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_subpel_variance.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpel_variance.o" source/libvpx/vp9/encoder/x86/vp9_subpel_variance.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpel_variance.o" source/libvpx/vp9/encoder/x86/vp9_subpel_variance.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subtract_sse2.o: gyp_local_path := $(LOCAL_PATH)
@@ -519,7 +510,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subtract_sse2.o: gyp_inter
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subtract_sse2.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subtract_sse2.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subtract_sse2.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_subtract_sse2.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subtract_sse2.o" source/libvpx/vp9/encoder/x86/vp9_subtract_sse2.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subtract_sse2.o" source/libvpx/vp9/encoder/x86/vp9_subtract_sse2.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_temporal_filter_apply_sse2.o: gyp_local_path := $(LOCAL_PATH)
@@ -528,7 +519,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_temporal_filter_apply_sse2
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_temporal_filter_apply_sse2.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_temporal_filter_apply_sse2.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_temporal_filter_apply_sse2.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_temporal_filter_apply_sse2.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_temporal_filter_apply_sse2.o" source/libvpx/vp9/encoder/x86/vp9_temporal_filter_apply_sse2.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_temporal_filter_apply_sse2.o" source/libvpx/vp9/encoder/x86/vp9_temporal_filter_apply_sse2.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_variance_impl_mmx.o: gyp_local_path := $(LOCAL_PATH)
@@ -537,7 +528,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_variance_impl_mmx.o: gyp_i
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_variance_impl_mmx.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_variance_impl_mmx.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_variance_impl_mmx.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_variance_impl_mmx.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_variance_impl_mmx.o" source/libvpx/vp9/encoder/x86/vp9_variance_impl_mmx.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_variance_impl_mmx.o" source/libvpx/vp9/encoder/x86/vp9_variance_impl_mmx.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_variance_impl_sse2.o: gyp_local_path := $(LOCAL_PATH)
@@ -546,7 +537,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_variance_impl_sse2.o: gyp_
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_variance_impl_sse2.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_variance_impl_sse2.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_variance_impl_sse2.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_variance_impl_sse2.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_variance_impl_sse2.o" source/libvpx/vp9/encoder/x86/vp9_variance_impl_sse2.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_variance_impl_sse2.o" source/libvpx/vp9/encoder/x86/vp9_variance_impl_sse2.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/emms.o: gyp_local_path := $(LOCAL_PATH)
@@ -555,7 +546,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/emms.o: gyp_intermediate_dir :
 $(gyp_shared_intermediate_dir)/third_party/libvpx/emms.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/emms.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/emms.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vpx_ports/emms.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/emms.o" source/libvpx/vpx_ports/emms.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/emms.o" source/libvpx/vpx_ports/emms.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/x86_abi_support.o: gyp_local_path := $(LOCAL_PATH)
@@ -564,7 +555,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/x86_abi_support.o: gyp_interme
 $(gyp_shared_intermediate_dir)/third_party/libvpx/x86_abi_support.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/x86_abi_support.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/x86_abi_support.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vpx_ports/x86_abi_support.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/x86_abi_support.o" source/libvpx/vpx_ports/x86_abi_support.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/x86_abi_support.o" source/libvpx/vpx_ports/x86_abi_support.asm
 
 
 
@@ -575,7 +566,7 @@ GYP_GENERATED_OUTPUTS := \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/idctllm_sse2.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/iwalsh_mmx.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/iwalsh_sse2.o \
-	$(gyp_shared_intermediate_dir)/third_party/libvpx/loopfilter_block_sse2.o \
+	$(gyp_shared_intermediate_dir)/third_party/libvpx/loopfilter_block_sse2_x86_64.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/loopfilter_mmx.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/loopfilter_sse2.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/mfqe_sse2.o \
@@ -599,12 +590,11 @@ GYP_GENERATED_OUTPUTS := \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/encodeopt.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/fwalsh_sse2.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/quantize_mmx.o \
-	$(gyp_shared_intermediate_dir)/third_party/libvpx/quantize_sse4.o \
-	$(gyp_shared_intermediate_dir)/third_party/libvpx/ssim_opt.o \
+	$(gyp_shared_intermediate_dir)/third_party/libvpx/ssim_opt_x86_64.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/subtract_mmx.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/subtract_sse2.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_copy_sse2.o \
-	$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_idct_ssse3.o \
+	$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_idct_ssse3_x86_64.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_intrapred_sse2.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_intrapred_ssse3.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_loopfilter_mmx.o \
@@ -613,16 +603,16 @@ GYP_GENERATED_OUTPUTS := \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_bilinear_sse2.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_bilinear_ssse3.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_dct_mmx.o \
-	$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_dct_ssse3.o \
+	$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_dct_ssse3_x86_64.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_error_sse2.o \
-	$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_quantize_ssse3.o \
+	$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_quantize_ssse3_x86_64.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad4d_sse2.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_mmx.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_sse2.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_sse3.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_sse4.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_ssse3.o \
-	$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_ssim_opt.o \
+	$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_ssim_opt_x86_64.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpel_variance.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subtract_sse2.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_temporal_filter_apply_sse2.o \
@@ -641,7 +631,7 @@ LOCAL_GENERATED_SOURCES := \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/idctllm_sse2.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/iwalsh_mmx.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/iwalsh_sse2.o \
-	$(gyp_shared_intermediate_dir)/third_party/libvpx/loopfilter_block_sse2.o \
+	$(gyp_shared_intermediate_dir)/third_party/libvpx/loopfilter_block_sse2_x86_64.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/loopfilter_mmx.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/loopfilter_sse2.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/mfqe_sse2.o \
@@ -665,12 +655,11 @@ LOCAL_GENERATED_SOURCES := \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/encodeopt.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/fwalsh_sse2.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/quantize_mmx.o \
-	$(gyp_shared_intermediate_dir)/third_party/libvpx/quantize_sse4.o \
-	$(gyp_shared_intermediate_dir)/third_party/libvpx/ssim_opt.o \
+	$(gyp_shared_intermediate_dir)/third_party/libvpx/ssim_opt_x86_64.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/subtract_mmx.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/subtract_sse2.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_copy_sse2.o \
-	$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_idct_ssse3.o \
+	$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_idct_ssse3_x86_64.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_intrapred_sse2.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_intrapred_ssse3.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_loopfilter_mmx.o \
@@ -679,16 +668,16 @@ LOCAL_GENERATED_SOURCES := \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_bilinear_sse2.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_bilinear_ssse3.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_dct_mmx.o \
-	$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_dct_ssse3.o \
+	$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_dct_ssse3_x86_64.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_error_sse2.o \
-	$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_quantize_ssse3.o \
+	$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_quantize_ssse3_x86_64.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad4d_sse2.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_mmx.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_sse2.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_sse3.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_sse4.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_ssse3.o \
-	$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_ssim_opt.o \
+	$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_ssim_opt_x86_64.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpel_variance.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subtract_sse2.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_temporal_filter_apply_sse2.o \
@@ -731,7 +720,6 @@ LOCAL_SRC_FILES := \
 	third_party/libvpx/source/libvpx/vp8/common/variance_c.c \
 	third_party/libvpx/source/libvpx/vp8/common/x86/filter_x86.c \
 	third_party/libvpx/source/libvpx/vp8/common/x86/loopfilter_x86.c \
-	third_party/libvpx/source/libvpx/vp8/common/x86/postproc_x86.c \
 	third_party/libvpx/source/libvpx/vp8/common/x86/vp8_asm_stubs.c \
 	third_party/libvpx/source/libvpx/vp8/decoder/dboolhuff.c \
 	third_party/libvpx/source/libvpx/vp8/decoder/decodeframe.c \
@@ -832,7 +820,6 @@ LOCAL_SRC_FILES := \
 	third_party/libvpx/source/libvpx/vp9/encoder/vp9_writer.c \
 	third_party/libvpx/source/libvpx/vp9/vp9_cx_iface.c \
 	third_party/libvpx/source/libvpx/vp9/vp9_dx_iface.c \
-	third_party/libvpx/source/libvpx/vpx/src/svc_encodeframe.c \
 	third_party/libvpx/source/libvpx/vpx/src/vpx_codec.c \
 	third_party/libvpx/source/libvpx/vpx/src/vpx_decoder.c \
 	third_party/libvpx/source/libvpx/vpx/src/vpx_encoder.c \
@@ -900,6 +887,7 @@ MY_DEFS_Debug := \
 	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DCLD_DATA_FROM_STATIC' \
 	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
@@ -941,6 +929,9 @@ LOCAL_CPPFLAGS_Debug := \
 	-fno-threadsafe-statics \
 	-fvisibility-inlines-hidden \
 	-Wno-deprecated \
+	-std=gnu++11 \
+	-Wno-narrowing \
+	-Wno-literal-suffix \
 	-Wno-non-virtual-dtor \
 	-Wno-sign-promo \
 	-Wno-non-virtual-dtor
@@ -1000,6 +991,7 @@ MY_DEFS_Release := \
 	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DCLD_DATA_FROM_STATIC' \
 	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
@@ -1041,6 +1033,9 @@ LOCAL_CPPFLAGS_Release := \
 	-fno-threadsafe-statics \
 	-fvisibility-inlines-hidden \
 	-Wno-deprecated \
+	-std=gnu++11 \
+	-Wno-narrowing \
+	-Wno-literal-suffix \
 	-Wno-non-virtual-dtor \
 	-Wno-sign-promo \
 	-Wno-non-virtual-dtor
diff --git a/libvpx.target.linux-arm.mk b/libvpx.target.linux-arm.mk
index bc6a763..ee68cc0 100644
--- a/libvpx.target.linux-arm.mk
+++ b/libvpx.target.linux-arm.mk
@@ -973,7 +973,6 @@ LOCAL_SRC_FILES := \
 	third_party/libvpx/source/libvpx/vp9/encoder/vp9_writer.c \
 	third_party/libvpx/source/libvpx/vp9/vp9_cx_iface.c \
 	third_party/libvpx/source/libvpx/vp9/vp9_dx_iface.c \
-	third_party/libvpx/source/libvpx/vpx/src/svc_encodeframe.c \
 	third_party/libvpx/source/libvpx/vpx/src/vpx_codec.c \
 	third_party/libvpx/source/libvpx/vpx/src/vpx_decoder.c \
 	third_party/libvpx/source/libvpx/vpx/src/vpx_encoder.c \
@@ -1051,6 +1050,7 @@ MY_DEFS_Debug := \
 	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DCLD_DATA_FROM_STATIC' \
 	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
@@ -1089,6 +1089,9 @@ LOCAL_CPPFLAGS_Debug := \
 	-fvisibility-inlines-hidden \
 	-Wno-deprecated \
 	-Wno-abi \
+	-std=gnu++11 \
+	-Wno-narrowing \
+	-Wno-literal-suffix \
 	-Wno-non-virtual-dtor \
 	-Wno-sign-promo \
 	-Wno-non-virtual-dtor
@@ -1156,6 +1159,7 @@ MY_DEFS_Release := \
 	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DCLD_DATA_FROM_STATIC' \
 	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
@@ -1194,6 +1198,9 @@ LOCAL_CPPFLAGS_Release := \
 	-fvisibility-inlines-hidden \
 	-Wno-deprecated \
 	-Wno-abi \
+	-std=gnu++11 \
+	-Wno-narrowing \
+	-Wno-literal-suffix \
 	-Wno-non-virtual-dtor \
 	-Wno-sign-promo \
 	-Wno-non-virtual-dtor
diff --git a/libvpx.target.linux-arm64.mk b/libvpx.target.linux-arm64.mk
index a63484a..4e4ab18 100644
--- a/libvpx.target.linux-arm64.mk
+++ b/libvpx.target.linux-arm64.mk
@@ -171,7 +171,6 @@ LOCAL_SRC_FILES := \
 	third_party/libvpx/source/libvpx/vp9/encoder/vp9_writer.c \
 	third_party/libvpx/source/libvpx/vp9/vp9_cx_iface.c \
 	third_party/libvpx/source/libvpx/vp9/vp9_dx_iface.c \
-	third_party/libvpx/source/libvpx/vpx/src/svc_encodeframe.c \
 	third_party/libvpx/source/libvpx/vpx/src/vpx_codec.c \
 	third_party/libvpx/source/libvpx/vpx/src/vpx_decoder.c \
 	third_party/libvpx/source/libvpx/vpx/src/vpx_encoder.c \
@@ -236,6 +235,7 @@ MY_DEFS_Debug := \
 	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DCLD_DATA_FROM_STATIC' \
 	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
@@ -277,6 +277,9 @@ LOCAL_CPPFLAGS_Debug := \
 	-fno-threadsafe-statics \
 	-fvisibility-inlines-hidden \
 	-Wno-deprecated \
+	-std=gnu++11 \
+	-Wno-narrowing \
+	-Wno-literal-suffix \
 	-Wno-non-virtual-dtor \
 	-Wno-sign-promo \
 	-Wno-non-virtual-dtor
@@ -332,6 +335,7 @@ MY_DEFS_Release := \
 	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DCLD_DATA_FROM_STATIC' \
 	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
@@ -373,6 +377,9 @@ LOCAL_CPPFLAGS_Release := \
 	-fno-threadsafe-statics \
 	-fvisibility-inlines-hidden \
 	-Wno-deprecated \
+	-std=gnu++11 \
+	-Wno-narrowing \
+	-Wno-literal-suffix \
 	-Wno-non-virtual-dtor \
 	-Wno-sign-promo \
 	-Wno-non-virtual-dtor
diff --git a/libvpx.target.linux-mips.mk b/libvpx.target.linux-mips.mk
index 3e4aeb5..fb2fb13 100644
--- a/libvpx.target.linux-mips.mk
+++ b/libvpx.target.linux-mips.mk
@@ -153,7 +153,6 @@ LOCAL_SRC_FILES := \
 	third_party/libvpx/source/libvpx/vp9/encoder/vp9_writer.c \
 	third_party/libvpx/source/libvpx/vp9/vp9_cx_iface.c \
 	third_party/libvpx/source/libvpx/vp9/vp9_dx_iface.c \
-	third_party/libvpx/source/libvpx/vpx/src/svc_encodeframe.c \
 	third_party/libvpx/source/libvpx/vpx/src/vpx_codec.c \
 	third_party/libvpx/source/libvpx/vpx/src/vpx_decoder.c \
 	third_party/libvpx/source/libvpx/vpx/src/vpx_encoder.c \
@@ -222,6 +221,7 @@ MY_DEFS_Debug := \
 	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DCLD_DATA_FROM_STATIC' \
 	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
@@ -263,6 +263,9 @@ LOCAL_CPPFLAGS_Debug := \
 	-fvisibility-inlines-hidden \
 	-Wno-deprecated \
 	-Wno-uninitialized \
+	-std=gnu++11 \
+	-Wno-narrowing \
+	-Wno-literal-suffix \
 	-Wno-non-virtual-dtor \
 	-Wno-sign-promo \
 	-Wno-non-virtual-dtor
@@ -323,6 +326,7 @@ MY_DEFS_Release := \
 	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DCLD_DATA_FROM_STATIC' \
 	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
@@ -364,6 +368,9 @@ LOCAL_CPPFLAGS_Release := \
 	-fvisibility-inlines-hidden \
 	-Wno-deprecated \
 	-Wno-uninitialized \
+	-std=gnu++11 \
+	-Wno-narrowing \
+	-Wno-literal-suffix \
 	-Wno-non-virtual-dtor \
 	-Wno-sign-promo \
 	-Wno-non-virtual-dtor
diff --git a/libvpx.target.linux-x86.mk b/libvpx.target.linux-x86.mk
index 405aee2..f52dfff 100644
--- a/libvpx.target.linux-x86.mk
+++ b/libvpx.target.linux-x86.mk
@@ -17,14 +17,14 @@ GYP_TARGET_DEPENDENCIES := \
 
 
 ### Generated for rule "third_party_libvpx_libvpx_gyp_libvpx_target_assemble":
-# "{'inputs': ['$(gyp_shared_intermediate_dir)/yasm'], 'extension': 'asm', 'process_outputs_as_sources': '1', 'outputs': ['$(gyp_shared_intermediate_dir)/third_party/libvpx/%(INPUT_ROOT)s.o'], 'rule_name': 'assemble', 'rule_sources': ['source/libvpx/third_party/x86inc/x86inc.asm', 'source/libvpx/vp8/common/x86/dequantize_mmx.asm', '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/mfqe_sse2.asm', 'source/libvpx/vp8/common/x86/postproc_mmx.asm', 'source/libvpx/vp8/common/x86/postproc_sse2.asm', 'source/libvpx/vp8/common/x86/recon_mmx.asm', 'source/libvpx/vp8/common/x86/recon_sse2.asm', '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/encoder/x86/dct_mmx.asm', 'source/libvpx/vp8/encoder/x86/dct_sse2.asm', '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_sse4.asm', 'source/libvpx/vp8/encoder/x86/subtract_mmx.asm', 'source/libvpx/vp8/encoder/x86/subtract_sse2.asm', 'source/libvpx/vp9/common/x86/vp9_copy_sse2.asm', 'source/libvpx/vp9/common/x86/vp9_intrapred_sse2.asm', 'source/libvpx/vp9/common/x86/vp9_intrapred_ssse3.asm', 'source/libvpx/vp9/common/x86/vp9_loopfilter_mmx.asm', 'source/libvpx/vp9/common/x86/vp9_subpixel_8t_sse2.asm', 'source/libvpx/vp9/common/x86/vp9_subpixel_8t_ssse3.asm', 'source/libvpx/vp9/common/x86/vp9_subpixel_bilinear_sse2.asm', 'source/libvpx/vp9/common/x86/vp9_subpixel_bilinear_ssse3.asm', 'source/libvpx/vp9/encoder/x86/vp9_dct_mmx.asm', 'source/libvpx/vp9/encoder/x86/vp9_error_sse2.asm', 'source/libvpx/vp9/encoder/x86/vp9_sad4d_sse2.asm', 'source/libvpx/vp9/encoder/x86/vp9_sad_mmx.asm', 'source/libvpx/vp9/encoder/x86/vp9_sad_sse2.asm', 'source/libvpx/vp9/encoder/x86/vp9_sad_sse3.asm', 'source/libvpx/vp9/encoder/x86/vp9_sad_sse4.asm', 'source/libvpx/vp9/encoder/x86/vp9_sad_ssse3.asm', 'source/libvpx/vp9/encoder/x86/vp9_subpel_variance.asm', 'source/libvpx/vp9/encoder/x86/vp9_subtract_sse2.asm', 'source/libvpx/vp9/encoder/x86/vp9_temporal_filter_apply_sse2.asm', 'source/libvpx/vp9/encoder/x86/vp9_variance_impl_mmx.asm', 'source/libvpx/vp9/encoder/x86/vp9_variance_impl_sse2.asm', 'source/libvpx/vpx_ports/emms.asm', 'source/libvpx/vpx_ports/x86_abi_support.asm'], 'action': ['$(gyp_shared_intermediate_dir)/yasm', '-D', 'CHROMIUM', '-I', 'source/config/linux/ia32', '-I', 'source/config', '-I', 'source/libvpx', '-I', '$(gyp_shared_intermediate_dir)/third_party/libvpx', '-felf32', '-m', 'x86', '-o', '$(gyp_shared_intermediate_dir)/third_party/libvpx/%(INPUT_ROOT)s.o', '$(RULE_SOURCES)'], 'message': 'Compile assembly $(RULE_SOURCES)'}":
+# "{'inputs': ['$(gyp_shared_intermediate_dir)/yasm'], 'extension': 'asm', 'process_outputs_as_sources': '1', 'outputs': ['$(gyp_shared_intermediate_dir)/third_party/libvpx/%(INPUT_ROOT)s.o'], 'rule_name': 'assemble', 'rule_sources': ['source/libvpx/third_party/x86inc/x86inc.asm', 'source/libvpx/vp8/common/x86/dequantize_mmx.asm', '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/mfqe_sse2.asm', 'source/libvpx/vp8/common/x86/postproc_mmx.asm', 'source/libvpx/vp8/common/x86/postproc_sse2.asm', 'source/libvpx/vp8/common/x86/recon_mmx.asm', 'source/libvpx/vp8/common/x86/recon_sse2.asm', '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/encoder/x86/dct_mmx.asm', 'source/libvpx/vp8/encoder/x86/dct_sse2.asm', '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/subtract_mmx.asm', 'source/libvpx/vp8/encoder/x86/subtract_sse2.asm', 'source/libvpx/vp9/common/x86/vp9_copy_sse2.asm', 'source/libvpx/vp9/common/x86/vp9_intrapred_sse2.asm', 'source/libvpx/vp9/common/x86/vp9_intrapred_ssse3.asm', 'source/libvpx/vp9/common/x86/vp9_loopfilter_mmx.asm', 'source/libvpx/vp9/common/x86/vp9_subpixel_8t_sse2.asm', 'source/libvpx/vp9/common/x86/vp9_subpixel_8t_ssse3.asm', 'source/libvpx/vp9/common/x86/vp9_subpixel_bilinear_sse2.asm', 'source/libvpx/vp9/common/x86/vp9_subpixel_bilinear_ssse3.asm', 'source/libvpx/vp9/encoder/x86/vp9_dct_mmx.asm', 'source/libvpx/vp9/encoder/x86/vp9_error_sse2.asm', 'source/libvpx/vp9/encoder/x86/vp9_sad4d_sse2.asm', 'source/libvpx/vp9/encoder/x86/vp9_sad_mmx.asm', 'source/libvpx/vp9/encoder/x86/vp9_sad_sse2.asm', 'source/libvpx/vp9/encoder/x86/vp9_sad_sse3.asm', 'source/libvpx/vp9/encoder/x86/vp9_sad_sse4.asm', 'source/libvpx/vp9/encoder/x86/vp9_sad_ssse3.asm', 'source/libvpx/vp9/encoder/x86/vp9_subpel_variance.asm', 'source/libvpx/vp9/encoder/x86/vp9_subtract_sse2.asm', 'source/libvpx/vp9/encoder/x86/vp9_temporal_filter_apply_sse2.asm', 'source/libvpx/vp9/encoder/x86/vp9_variance_impl_mmx.asm', 'source/libvpx/vp9/encoder/x86/vp9_variance_impl_sse2.asm', 'source/libvpx/vpx_ports/emms.asm', 'source/libvpx/vpx_ports/x86_abi_support.asm'], 'action': ['$(gyp_shared_intermediate_dir)/yasm', '-D', 'CHROMIUM', '-I', 'source/config/linux/ia32', '-I', 'source/config', '-I', 'source/libvpx', '-I', '$(gyp_shared_intermediate_dir)/third_party/libvpx', '-D', '__ANDROID__', '-felf32', '-m', 'x86', '-o', '$(gyp_shared_intermediate_dir)/third_party/libvpx/%(INPUT_ROOT)s.o', '$(RULE_SOURCES)'], 'message': 'Compile assembly $(RULE_SOURCES)'}":
 $(gyp_shared_intermediate_dir)/third_party/libvpx/x86inc.o: gyp_local_path := $(LOCAL_PATH)
 $(gyp_shared_intermediate_dir)/third_party/libvpx/x86inc.o: gyp_var_prefix := $(GYP_VAR_PREFIX)
 $(gyp_shared_intermediate_dir)/third_party/libvpx/x86inc.o: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/x86inc.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/x86inc.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/x86inc.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/third_party/x86inc/x86inc.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/x86inc.o" source/libvpx/third_party/x86inc/x86inc.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/x86inc.o" source/libvpx/third_party/x86inc/x86inc.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/dequantize_mmx.o: gyp_local_path := $(LOCAL_PATH)
@@ -33,7 +33,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/dequantize_mmx.o: gyp_intermed
 $(gyp_shared_intermediate_dir)/third_party/libvpx/dequantize_mmx.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/dequantize_mmx.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/dequantize_mmx.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/common/x86/dequantize_mmx.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/dequantize_mmx.o" source/libvpx/vp8/common/x86/dequantize_mmx.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/dequantize_mmx.o" source/libvpx/vp8/common/x86/dequantize_mmx.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/idctllm_mmx.o: gyp_local_path := $(LOCAL_PATH)
@@ -42,7 +42,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/idctllm_mmx.o: gyp_intermediat
 $(gyp_shared_intermediate_dir)/third_party/libvpx/idctllm_mmx.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/idctllm_mmx.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/idctllm_mmx.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/common/x86/idctllm_mmx.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/idctllm_mmx.o" source/libvpx/vp8/common/x86/idctllm_mmx.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/idctllm_mmx.o" source/libvpx/vp8/common/x86/idctllm_mmx.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/idctllm_sse2.o: gyp_local_path := $(LOCAL_PATH)
@@ -51,7 +51,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/idctllm_sse2.o: gyp_intermedia
 $(gyp_shared_intermediate_dir)/third_party/libvpx/idctllm_sse2.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/idctllm_sse2.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/idctllm_sse2.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/common/x86/idctllm_sse2.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/idctllm_sse2.o" source/libvpx/vp8/common/x86/idctllm_sse2.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/idctllm_sse2.o" source/libvpx/vp8/common/x86/idctllm_sse2.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/iwalsh_mmx.o: gyp_local_path := $(LOCAL_PATH)
@@ -60,7 +60,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/iwalsh_mmx.o: gyp_intermediate
 $(gyp_shared_intermediate_dir)/third_party/libvpx/iwalsh_mmx.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/iwalsh_mmx.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/iwalsh_mmx.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/common/x86/iwalsh_mmx.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/iwalsh_mmx.o" source/libvpx/vp8/common/x86/iwalsh_mmx.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/iwalsh_mmx.o" source/libvpx/vp8/common/x86/iwalsh_mmx.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/iwalsh_sse2.o: gyp_local_path := $(LOCAL_PATH)
@@ -69,7 +69,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/iwalsh_sse2.o: gyp_intermediat
 $(gyp_shared_intermediate_dir)/third_party/libvpx/iwalsh_sse2.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/iwalsh_sse2.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/iwalsh_sse2.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/common/x86/iwalsh_sse2.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/iwalsh_sse2.o" source/libvpx/vp8/common/x86/iwalsh_sse2.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/iwalsh_sse2.o" source/libvpx/vp8/common/x86/iwalsh_sse2.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/loopfilter_mmx.o: gyp_local_path := $(LOCAL_PATH)
@@ -78,7 +78,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/loopfilter_mmx.o: gyp_intermed
 $(gyp_shared_intermediate_dir)/third_party/libvpx/loopfilter_mmx.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/loopfilter_mmx.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/loopfilter_mmx.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/common/x86/loopfilter_mmx.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/loopfilter_mmx.o" source/libvpx/vp8/common/x86/loopfilter_mmx.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/loopfilter_mmx.o" source/libvpx/vp8/common/x86/loopfilter_mmx.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/loopfilter_sse2.o: gyp_local_path := $(LOCAL_PATH)
@@ -87,7 +87,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/loopfilter_sse2.o: gyp_interme
 $(gyp_shared_intermediate_dir)/third_party/libvpx/loopfilter_sse2.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/loopfilter_sse2.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/loopfilter_sse2.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/common/x86/loopfilter_sse2.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/loopfilter_sse2.o" source/libvpx/vp8/common/x86/loopfilter_sse2.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/loopfilter_sse2.o" source/libvpx/vp8/common/x86/loopfilter_sse2.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/mfqe_sse2.o: gyp_local_path := $(LOCAL_PATH)
@@ -96,7 +96,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/mfqe_sse2.o: gyp_intermediate_
 $(gyp_shared_intermediate_dir)/third_party/libvpx/mfqe_sse2.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/mfqe_sse2.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/mfqe_sse2.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/common/x86/mfqe_sse2.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/mfqe_sse2.o" source/libvpx/vp8/common/x86/mfqe_sse2.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/mfqe_sse2.o" source/libvpx/vp8/common/x86/mfqe_sse2.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/postproc_mmx.o: gyp_local_path := $(LOCAL_PATH)
@@ -105,7 +105,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/postproc_mmx.o: gyp_intermedia
 $(gyp_shared_intermediate_dir)/third_party/libvpx/postproc_mmx.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/postproc_mmx.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/postproc_mmx.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/common/x86/postproc_mmx.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/postproc_mmx.o" source/libvpx/vp8/common/x86/postproc_mmx.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/postproc_mmx.o" source/libvpx/vp8/common/x86/postproc_mmx.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/postproc_sse2.o: gyp_local_path := $(LOCAL_PATH)
@@ -114,7 +114,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/postproc_sse2.o: gyp_intermedi
 $(gyp_shared_intermediate_dir)/third_party/libvpx/postproc_sse2.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/postproc_sse2.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/postproc_sse2.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/common/x86/postproc_sse2.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/postproc_sse2.o" source/libvpx/vp8/common/x86/postproc_sse2.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/postproc_sse2.o" source/libvpx/vp8/common/x86/postproc_sse2.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/recon_mmx.o: gyp_local_path := $(LOCAL_PATH)
@@ -123,7 +123,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/recon_mmx.o: gyp_intermediate_
 $(gyp_shared_intermediate_dir)/third_party/libvpx/recon_mmx.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/recon_mmx.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/recon_mmx.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/common/x86/recon_mmx.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/recon_mmx.o" source/libvpx/vp8/common/x86/recon_mmx.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/recon_mmx.o" source/libvpx/vp8/common/x86/recon_mmx.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/recon_sse2.o: gyp_local_path := $(LOCAL_PATH)
@@ -132,7 +132,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/recon_sse2.o: gyp_intermediate
 $(gyp_shared_intermediate_dir)/third_party/libvpx/recon_sse2.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/recon_sse2.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/recon_sse2.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/common/x86/recon_sse2.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/recon_sse2.o" source/libvpx/vp8/common/x86/recon_sse2.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/recon_sse2.o" source/libvpx/vp8/common/x86/recon_sse2.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/sad_mmx.o: gyp_local_path := $(LOCAL_PATH)
@@ -141,7 +141,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/sad_mmx.o: gyp_intermediate_di
 $(gyp_shared_intermediate_dir)/third_party/libvpx/sad_mmx.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/sad_mmx.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/sad_mmx.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/common/x86/sad_mmx.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/sad_mmx.o" source/libvpx/vp8/common/x86/sad_mmx.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/sad_mmx.o" source/libvpx/vp8/common/x86/sad_mmx.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/sad_sse2.o: gyp_local_path := $(LOCAL_PATH)
@@ -150,7 +150,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/sad_sse2.o: gyp_intermediate_d
 $(gyp_shared_intermediate_dir)/third_party/libvpx/sad_sse2.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/sad_sse2.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/sad_sse2.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/common/x86/sad_sse2.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/sad_sse2.o" source/libvpx/vp8/common/x86/sad_sse2.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/sad_sse2.o" source/libvpx/vp8/common/x86/sad_sse2.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/sad_sse3.o: gyp_local_path := $(LOCAL_PATH)
@@ -159,7 +159,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/sad_sse3.o: gyp_intermediate_d
 $(gyp_shared_intermediate_dir)/third_party/libvpx/sad_sse3.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/sad_sse3.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/sad_sse3.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/common/x86/sad_sse3.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/sad_sse3.o" source/libvpx/vp8/common/x86/sad_sse3.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/sad_sse3.o" source/libvpx/vp8/common/x86/sad_sse3.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/sad_sse4.o: gyp_local_path := $(LOCAL_PATH)
@@ -168,7 +168,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/sad_sse4.o: gyp_intermediate_d
 $(gyp_shared_intermediate_dir)/third_party/libvpx/sad_sse4.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/sad_sse4.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/sad_sse4.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/common/x86/sad_sse4.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/sad_sse4.o" source/libvpx/vp8/common/x86/sad_sse4.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/sad_sse4.o" source/libvpx/vp8/common/x86/sad_sse4.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/sad_ssse3.o: gyp_local_path := $(LOCAL_PATH)
@@ -177,7 +177,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/sad_ssse3.o: gyp_intermediate_
 $(gyp_shared_intermediate_dir)/third_party/libvpx/sad_ssse3.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/sad_ssse3.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/sad_ssse3.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/common/x86/sad_ssse3.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/sad_ssse3.o" source/libvpx/vp8/common/x86/sad_ssse3.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/sad_ssse3.o" source/libvpx/vp8/common/x86/sad_ssse3.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/subpixel_mmx.o: gyp_local_path := $(LOCAL_PATH)
@@ -186,7 +186,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/subpixel_mmx.o: gyp_intermedia
 $(gyp_shared_intermediate_dir)/third_party/libvpx/subpixel_mmx.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/subpixel_mmx.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/subpixel_mmx.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/common/x86/subpixel_mmx.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/subpixel_mmx.o" source/libvpx/vp8/common/x86/subpixel_mmx.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/subpixel_mmx.o" source/libvpx/vp8/common/x86/subpixel_mmx.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/subpixel_sse2.o: gyp_local_path := $(LOCAL_PATH)
@@ -195,7 +195,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/subpixel_sse2.o: gyp_intermedi
 $(gyp_shared_intermediate_dir)/third_party/libvpx/subpixel_sse2.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/subpixel_sse2.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/subpixel_sse2.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/common/x86/subpixel_sse2.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/subpixel_sse2.o" source/libvpx/vp8/common/x86/subpixel_sse2.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/subpixel_sse2.o" source/libvpx/vp8/common/x86/subpixel_sse2.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/subpixel_ssse3.o: gyp_local_path := $(LOCAL_PATH)
@@ -204,7 +204,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/subpixel_ssse3.o: gyp_intermed
 $(gyp_shared_intermediate_dir)/third_party/libvpx/subpixel_ssse3.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/subpixel_ssse3.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/subpixel_ssse3.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/common/x86/subpixel_ssse3.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/subpixel_ssse3.o" source/libvpx/vp8/common/x86/subpixel_ssse3.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/subpixel_ssse3.o" source/libvpx/vp8/common/x86/subpixel_ssse3.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/variance_impl_mmx.o: gyp_local_path := $(LOCAL_PATH)
@@ -213,7 +213,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/variance_impl_mmx.o: gyp_inter
 $(gyp_shared_intermediate_dir)/third_party/libvpx/variance_impl_mmx.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/variance_impl_mmx.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/variance_impl_mmx.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/common/x86/variance_impl_mmx.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/variance_impl_mmx.o" source/libvpx/vp8/common/x86/variance_impl_mmx.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/variance_impl_mmx.o" source/libvpx/vp8/common/x86/variance_impl_mmx.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/variance_impl_sse2.o: gyp_local_path := $(LOCAL_PATH)
@@ -222,7 +222,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/variance_impl_sse2.o: gyp_inte
 $(gyp_shared_intermediate_dir)/third_party/libvpx/variance_impl_sse2.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/variance_impl_sse2.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/variance_impl_sse2.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/common/x86/variance_impl_sse2.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/variance_impl_sse2.o" source/libvpx/vp8/common/x86/variance_impl_sse2.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/variance_impl_sse2.o" source/libvpx/vp8/common/x86/variance_impl_sse2.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/variance_impl_ssse3.o: gyp_local_path := $(LOCAL_PATH)
@@ -231,7 +231,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/variance_impl_ssse3.o: gyp_int
 $(gyp_shared_intermediate_dir)/third_party/libvpx/variance_impl_ssse3.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/variance_impl_ssse3.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/variance_impl_ssse3.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/common/x86/variance_impl_ssse3.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/variance_impl_ssse3.o" source/libvpx/vp8/common/x86/variance_impl_ssse3.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/variance_impl_ssse3.o" source/libvpx/vp8/common/x86/variance_impl_ssse3.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/dct_mmx.o: gyp_local_path := $(LOCAL_PATH)
@@ -240,7 +240,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/dct_mmx.o: gyp_intermediate_di
 $(gyp_shared_intermediate_dir)/third_party/libvpx/dct_mmx.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/dct_mmx.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/dct_mmx.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/encoder/x86/dct_mmx.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/dct_mmx.o" source/libvpx/vp8/encoder/x86/dct_mmx.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/dct_mmx.o" source/libvpx/vp8/encoder/x86/dct_mmx.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/dct_sse2.o: gyp_local_path := $(LOCAL_PATH)
@@ -249,7 +249,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/dct_sse2.o: gyp_intermediate_d
 $(gyp_shared_intermediate_dir)/third_party/libvpx/dct_sse2.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/dct_sse2.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/dct_sse2.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/encoder/x86/dct_sse2.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/dct_sse2.o" source/libvpx/vp8/encoder/x86/dct_sse2.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/dct_sse2.o" source/libvpx/vp8/encoder/x86/dct_sse2.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/encodeopt.o: gyp_local_path := $(LOCAL_PATH)
@@ -258,7 +258,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/encodeopt.o: gyp_intermediate_
 $(gyp_shared_intermediate_dir)/third_party/libvpx/encodeopt.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/encodeopt.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/encodeopt.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/encoder/x86/encodeopt.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/encodeopt.o" source/libvpx/vp8/encoder/x86/encodeopt.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/encodeopt.o" source/libvpx/vp8/encoder/x86/encodeopt.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/fwalsh_sse2.o: gyp_local_path := $(LOCAL_PATH)
@@ -267,7 +267,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/fwalsh_sse2.o: gyp_intermediat
 $(gyp_shared_intermediate_dir)/third_party/libvpx/fwalsh_sse2.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/fwalsh_sse2.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/fwalsh_sse2.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/encoder/x86/fwalsh_sse2.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/fwalsh_sse2.o" source/libvpx/vp8/encoder/x86/fwalsh_sse2.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/fwalsh_sse2.o" source/libvpx/vp8/encoder/x86/fwalsh_sse2.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/quantize_mmx.o: gyp_local_path := $(LOCAL_PATH)
@@ -276,16 +276,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/quantize_mmx.o: gyp_intermedia
 $(gyp_shared_intermediate_dir)/third_party/libvpx/quantize_mmx.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/quantize_mmx.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/quantize_mmx.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/encoder/x86/quantize_mmx.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/quantize_mmx.o" source/libvpx/vp8/encoder/x86/quantize_mmx.asm
-
-
-$(gyp_shared_intermediate_dir)/third_party/libvpx/quantize_sse4.o: gyp_local_path := $(LOCAL_PATH)
-$(gyp_shared_intermediate_dir)/third_party/libvpx/quantize_sse4.o: gyp_var_prefix := $(GYP_VAR_PREFIX)
-$(gyp_shared_intermediate_dir)/third_party/libvpx/quantize_sse4.o: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir))
-$(gyp_shared_intermediate_dir)/third_party/libvpx/quantize_sse4.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
-$(gyp_shared_intermediate_dir)/third_party/libvpx/quantize_sse4.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
-$(gyp_shared_intermediate_dir)/third_party/libvpx/quantize_sse4.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/encoder/x86/quantize_sse4.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/quantize_sse4.o" source/libvpx/vp8/encoder/x86/quantize_sse4.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/quantize_mmx.o" source/libvpx/vp8/encoder/x86/quantize_mmx.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/subtract_mmx.o: gyp_local_path := $(LOCAL_PATH)
@@ -294,7 +285,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/subtract_mmx.o: gyp_intermedia
 $(gyp_shared_intermediate_dir)/third_party/libvpx/subtract_mmx.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/subtract_mmx.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/subtract_mmx.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/encoder/x86/subtract_mmx.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/subtract_mmx.o" source/libvpx/vp8/encoder/x86/subtract_mmx.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/subtract_mmx.o" source/libvpx/vp8/encoder/x86/subtract_mmx.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/subtract_sse2.o: gyp_local_path := $(LOCAL_PATH)
@@ -303,7 +294,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/subtract_sse2.o: gyp_intermedi
 $(gyp_shared_intermediate_dir)/third_party/libvpx/subtract_sse2.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/subtract_sse2.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/subtract_sse2.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/encoder/x86/subtract_sse2.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/subtract_sse2.o" source/libvpx/vp8/encoder/x86/subtract_sse2.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/subtract_sse2.o" source/libvpx/vp8/encoder/x86/subtract_sse2.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_copy_sse2.o: gyp_local_path := $(LOCAL_PATH)
@@ -312,7 +303,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_copy_sse2.o: gyp_intermedi
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_copy_sse2.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_copy_sse2.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_copy_sse2.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp9/common/x86/vp9_copy_sse2.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_copy_sse2.o" source/libvpx/vp9/common/x86/vp9_copy_sse2.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_copy_sse2.o" source/libvpx/vp9/common/x86/vp9_copy_sse2.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_intrapred_sse2.o: gyp_local_path := $(LOCAL_PATH)
@@ -321,7 +312,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_intrapred_sse2.o: gyp_inte
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_intrapred_sse2.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_intrapred_sse2.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_intrapred_sse2.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp9/common/x86/vp9_intrapred_sse2.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_intrapred_sse2.o" source/libvpx/vp9/common/x86/vp9_intrapred_sse2.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_intrapred_sse2.o" source/libvpx/vp9/common/x86/vp9_intrapred_sse2.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_intrapred_ssse3.o: gyp_local_path := $(LOCAL_PATH)
@@ -330,7 +321,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_intrapred_ssse3.o: gyp_int
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_intrapred_ssse3.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_intrapred_ssse3.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_intrapred_ssse3.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp9/common/x86/vp9_intrapred_ssse3.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_intrapred_ssse3.o" source/libvpx/vp9/common/x86/vp9_intrapred_ssse3.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_intrapred_ssse3.o" source/libvpx/vp9/common/x86/vp9_intrapred_ssse3.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_loopfilter_mmx.o: gyp_local_path := $(LOCAL_PATH)
@@ -339,7 +330,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_loopfilter_mmx.o: gyp_inte
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_loopfilter_mmx.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_loopfilter_mmx.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_loopfilter_mmx.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp9/common/x86/vp9_loopfilter_mmx.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_loopfilter_mmx.o" source/libvpx/vp9/common/x86/vp9_loopfilter_mmx.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_loopfilter_mmx.o" source/libvpx/vp9/common/x86/vp9_loopfilter_mmx.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_8t_sse2.o: gyp_local_path := $(LOCAL_PATH)
@@ -348,7 +339,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_8t_sse2.o: gyp_in
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_8t_sse2.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_8t_sse2.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_8t_sse2.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp9/common/x86/vp9_subpixel_8t_sse2.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_8t_sse2.o" source/libvpx/vp9/common/x86/vp9_subpixel_8t_sse2.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_8t_sse2.o" source/libvpx/vp9/common/x86/vp9_subpixel_8t_sse2.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_8t_ssse3.o: gyp_local_path := $(LOCAL_PATH)
@@ -357,7 +348,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_8t_ssse3.o: gyp_i
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_8t_ssse3.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_8t_ssse3.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_8t_ssse3.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp9/common/x86/vp9_subpixel_8t_ssse3.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_8t_ssse3.o" source/libvpx/vp9/common/x86/vp9_subpixel_8t_ssse3.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_8t_ssse3.o" source/libvpx/vp9/common/x86/vp9_subpixel_8t_ssse3.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_bilinear_sse2.o: gyp_local_path := $(LOCAL_PATH)
@@ -366,7 +357,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_bilinear_sse2.o:
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_bilinear_sse2.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_bilinear_sse2.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_bilinear_sse2.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp9/common/x86/vp9_subpixel_bilinear_sse2.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_bilinear_sse2.o" source/libvpx/vp9/common/x86/vp9_subpixel_bilinear_sse2.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_bilinear_sse2.o" source/libvpx/vp9/common/x86/vp9_subpixel_bilinear_sse2.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_bilinear_ssse3.o: gyp_local_path := $(LOCAL_PATH)
@@ -375,7 +366,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_bilinear_ssse3.o:
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_bilinear_ssse3.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_bilinear_ssse3.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_bilinear_ssse3.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp9/common/x86/vp9_subpixel_bilinear_ssse3.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_bilinear_ssse3.o" source/libvpx/vp9/common/x86/vp9_subpixel_bilinear_ssse3.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_bilinear_ssse3.o" source/libvpx/vp9/common/x86/vp9_subpixel_bilinear_ssse3.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_dct_mmx.o: gyp_local_path := $(LOCAL_PATH)
@@ -384,7 +375,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_dct_mmx.o: gyp_intermediat
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_dct_mmx.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_dct_mmx.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_dct_mmx.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_dct_mmx.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_dct_mmx.o" source/libvpx/vp9/encoder/x86/vp9_dct_mmx.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_dct_mmx.o" source/libvpx/vp9/encoder/x86/vp9_dct_mmx.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_error_sse2.o: gyp_local_path := $(LOCAL_PATH)
@@ -393,7 +384,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_error_sse2.o: gyp_intermed
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_error_sse2.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_error_sse2.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_error_sse2.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_error_sse2.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_error_sse2.o" source/libvpx/vp9/encoder/x86/vp9_error_sse2.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_error_sse2.o" source/libvpx/vp9/encoder/x86/vp9_error_sse2.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad4d_sse2.o: gyp_local_path := $(LOCAL_PATH)
@@ -402,7 +393,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad4d_sse2.o: gyp_intermed
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad4d_sse2.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad4d_sse2.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad4d_sse2.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_sad4d_sse2.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad4d_sse2.o" source/libvpx/vp9/encoder/x86/vp9_sad4d_sse2.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad4d_sse2.o" source/libvpx/vp9/encoder/x86/vp9_sad4d_sse2.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_mmx.o: gyp_local_path := $(LOCAL_PATH)
@@ -411,7 +402,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_mmx.o: gyp_intermediat
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_mmx.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_mmx.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_mmx.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_sad_mmx.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_mmx.o" source/libvpx/vp9/encoder/x86/vp9_sad_mmx.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_mmx.o" source/libvpx/vp9/encoder/x86/vp9_sad_mmx.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_sse2.o: gyp_local_path := $(LOCAL_PATH)
@@ -420,7 +411,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_sse2.o: gyp_intermedia
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_sse2.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_sse2.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_sse2.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_sad_sse2.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_sse2.o" source/libvpx/vp9/encoder/x86/vp9_sad_sse2.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_sse2.o" source/libvpx/vp9/encoder/x86/vp9_sad_sse2.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_sse3.o: gyp_local_path := $(LOCAL_PATH)
@@ -429,7 +420,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_sse3.o: gyp_intermedia
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_sse3.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_sse3.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_sse3.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_sad_sse3.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_sse3.o" source/libvpx/vp9/encoder/x86/vp9_sad_sse3.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_sse3.o" source/libvpx/vp9/encoder/x86/vp9_sad_sse3.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_sse4.o: gyp_local_path := $(LOCAL_PATH)
@@ -438,7 +429,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_sse4.o: gyp_intermedia
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_sse4.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_sse4.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_sse4.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_sad_sse4.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_sse4.o" source/libvpx/vp9/encoder/x86/vp9_sad_sse4.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_sse4.o" source/libvpx/vp9/encoder/x86/vp9_sad_sse4.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_ssse3.o: gyp_local_path := $(LOCAL_PATH)
@@ -447,7 +438,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_ssse3.o: gyp_intermedi
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_ssse3.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_ssse3.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_ssse3.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_sad_ssse3.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_ssse3.o" source/libvpx/vp9/encoder/x86/vp9_sad_ssse3.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_ssse3.o" source/libvpx/vp9/encoder/x86/vp9_sad_ssse3.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpel_variance.o: gyp_local_path := $(LOCAL_PATH)
@@ -456,7 +447,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpel_variance.o: gyp_int
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpel_variance.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpel_variance.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpel_variance.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_subpel_variance.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpel_variance.o" source/libvpx/vp9/encoder/x86/vp9_subpel_variance.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpel_variance.o" source/libvpx/vp9/encoder/x86/vp9_subpel_variance.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subtract_sse2.o: gyp_local_path := $(LOCAL_PATH)
@@ -465,7 +456,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subtract_sse2.o: gyp_inter
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subtract_sse2.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subtract_sse2.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subtract_sse2.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_subtract_sse2.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subtract_sse2.o" source/libvpx/vp9/encoder/x86/vp9_subtract_sse2.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subtract_sse2.o" source/libvpx/vp9/encoder/x86/vp9_subtract_sse2.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_temporal_filter_apply_sse2.o: gyp_local_path := $(LOCAL_PATH)
@@ -474,7 +465,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_temporal_filter_apply_sse2
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_temporal_filter_apply_sse2.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_temporal_filter_apply_sse2.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_temporal_filter_apply_sse2.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_temporal_filter_apply_sse2.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_temporal_filter_apply_sse2.o" source/libvpx/vp9/encoder/x86/vp9_temporal_filter_apply_sse2.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_temporal_filter_apply_sse2.o" source/libvpx/vp9/encoder/x86/vp9_temporal_filter_apply_sse2.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_variance_impl_mmx.o: gyp_local_path := $(LOCAL_PATH)
@@ -483,7 +474,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_variance_impl_mmx.o: gyp_i
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_variance_impl_mmx.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_variance_impl_mmx.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_variance_impl_mmx.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_variance_impl_mmx.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_variance_impl_mmx.o" source/libvpx/vp9/encoder/x86/vp9_variance_impl_mmx.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_variance_impl_mmx.o" source/libvpx/vp9/encoder/x86/vp9_variance_impl_mmx.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_variance_impl_sse2.o: gyp_local_path := $(LOCAL_PATH)
@@ -492,7 +483,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_variance_impl_sse2.o: gyp_
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_variance_impl_sse2.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_variance_impl_sse2.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_variance_impl_sse2.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_variance_impl_sse2.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_variance_impl_sse2.o" source/libvpx/vp9/encoder/x86/vp9_variance_impl_sse2.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_variance_impl_sse2.o" source/libvpx/vp9/encoder/x86/vp9_variance_impl_sse2.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/emms.o: gyp_local_path := $(LOCAL_PATH)
@@ -501,7 +492,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/emms.o: gyp_intermediate_dir :
 $(gyp_shared_intermediate_dir)/third_party/libvpx/emms.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/emms.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/emms.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vpx_ports/emms.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/emms.o" source/libvpx/vpx_ports/emms.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/emms.o" source/libvpx/vpx_ports/emms.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/x86_abi_support.o: gyp_local_path := $(LOCAL_PATH)
@@ -510,7 +501,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/x86_abi_support.o: gyp_interme
 $(gyp_shared_intermediate_dir)/third_party/libvpx/x86_abi_support.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/x86_abi_support.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/x86_abi_support.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vpx_ports/x86_abi_support.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/x86_abi_support.o" source/libvpx/vpx_ports/x86_abi_support.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/ia32 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/x86_abi_support.o" source/libvpx/vpx_ports/x86_abi_support.asm
 
 
 
@@ -544,7 +535,6 @@ GYP_GENERATED_OUTPUTS := \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/encodeopt.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/fwalsh_sse2.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/quantize_mmx.o \
-	$(gyp_shared_intermediate_dir)/third_party/libvpx/quantize_sse4.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/subtract_mmx.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/subtract_sse2.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_copy_sse2.o \
@@ -604,7 +594,6 @@ LOCAL_GENERATED_SOURCES := \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/encodeopt.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/fwalsh_sse2.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/quantize_mmx.o \
-	$(gyp_shared_intermediate_dir)/third_party/libvpx/quantize_sse4.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/subtract_mmx.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/subtract_sse2.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_copy_sse2.o \
@@ -665,7 +654,6 @@ LOCAL_SRC_FILES := \
 	third_party/libvpx/source/libvpx/vp8/common/variance_c.c \
 	third_party/libvpx/source/libvpx/vp8/common/x86/filter_x86.c \
 	third_party/libvpx/source/libvpx/vp8/common/x86/loopfilter_x86.c \
-	third_party/libvpx/source/libvpx/vp8/common/x86/postproc_x86.c \
 	third_party/libvpx/source/libvpx/vp8/common/x86/vp8_asm_stubs.c \
 	third_party/libvpx/source/libvpx/vp8/decoder/dboolhuff.c \
 	third_party/libvpx/source/libvpx/vp8/decoder/decodeframe.c \
@@ -766,7 +754,6 @@ LOCAL_SRC_FILES := \
 	third_party/libvpx/source/libvpx/vp9/encoder/vp9_writer.c \
 	third_party/libvpx/source/libvpx/vp9/vp9_cx_iface.c \
 	third_party/libvpx/source/libvpx/vp9/vp9_dx_iface.c \
-	third_party/libvpx/source/libvpx/vpx/src/svc_encodeframe.c \
 	third_party/libvpx/source/libvpx/vpx/src/vpx_codec.c \
 	third_party/libvpx/source/libvpx/vpx/src/vpx_decoder.c \
 	third_party/libvpx/source/libvpx/vpx/src/vpx_encoder.c \
@@ -835,6 +822,7 @@ MY_DEFS_Debug := \
 	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DCLD_DATA_FROM_STATIC' \
 	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
@@ -876,6 +864,9 @@ LOCAL_CPPFLAGS_Debug := \
 	-fno-threadsafe-statics \
 	-fvisibility-inlines-hidden \
 	-Wno-deprecated \
+	-std=gnu++11 \
+	-Wno-narrowing \
+	-Wno-literal-suffix \
 	-Wno-non-virtual-dtor \
 	-Wno-sign-promo \
 	-Wno-non-virtual-dtor
@@ -936,6 +927,7 @@ MY_DEFS_Release := \
 	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DCLD_DATA_FROM_STATIC' \
 	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
@@ -977,6 +969,9 @@ LOCAL_CPPFLAGS_Release := \
 	-fno-threadsafe-statics \
 	-fvisibility-inlines-hidden \
 	-Wno-deprecated \
+	-std=gnu++11 \
+	-Wno-narrowing \
+	-Wno-literal-suffix \
 	-Wno-non-virtual-dtor \
 	-Wno-sign-promo \
 	-Wno-non-virtual-dtor
diff --git a/libvpx.target.linux-x86_64.mk b/libvpx.target.linux-x86_64.mk
index 7ed0f6f..abd45a1 100644
--- a/libvpx.target.linux-x86_64.mk
+++ b/libvpx.target.linux-x86_64.mk
@@ -17,14 +17,14 @@ GYP_TARGET_DEPENDENCIES := \
 
 
 ### Generated for rule "third_party_libvpx_libvpx_gyp_libvpx_target_assemble":
-# "{'inputs': ['$(gyp_shared_intermediate_dir)/yasm'], 'extension': 'asm', 'process_outputs_as_sources': '1', 'outputs': ['$(gyp_shared_intermediate_dir)/third_party/libvpx/%(INPUT_ROOT)s.o'], 'rule_name': 'assemble', 'rule_sources': ['source/libvpx/third_party/x86inc/x86inc.asm', 'source/libvpx/vp8/common/x86/dequantize_mmx.asm', '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/mfqe_sse2.asm', 'source/libvpx/vp8/common/x86/postproc_mmx.asm', 'source/libvpx/vp8/common/x86/postproc_sse2.asm', 'source/libvpx/vp8/common/x86/recon_mmx.asm', 'source/libvpx/vp8/common/x86/recon_sse2.asm', '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/encoder/x86/dct_mmx.asm', 'source/libvpx/vp8/encoder/x86/dct_sse2.asm', '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_sse4.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/vp9/common/x86/vp9_copy_sse2.asm', 'source/libvpx/vp9/common/x86/vp9_idct_ssse3.asm', 'source/libvpx/vp9/common/x86/vp9_intrapred_sse2.asm', 'source/libvpx/vp9/common/x86/vp9_intrapred_ssse3.asm', 'source/libvpx/vp9/common/x86/vp9_loopfilter_mmx.asm', 'source/libvpx/vp9/common/x86/vp9_subpixel_8t_sse2.asm', 'source/libvpx/vp9/common/x86/vp9_subpixel_8t_ssse3.asm', 'source/libvpx/vp9/common/x86/vp9_subpixel_bilinear_sse2.asm', 'source/libvpx/vp9/common/x86/vp9_subpixel_bilinear_ssse3.asm', 'source/libvpx/vp9/encoder/x86/vp9_dct_mmx.asm', 'source/libvpx/vp9/encoder/x86/vp9_dct_ssse3.asm', 'source/libvpx/vp9/encoder/x86/vp9_error_sse2.asm', 'source/libvpx/vp9/encoder/x86/vp9_quantize_ssse3.asm', 'source/libvpx/vp9/encoder/x86/vp9_sad4d_sse2.asm', 'source/libvpx/vp9/encoder/x86/vp9_sad_mmx.asm', 'source/libvpx/vp9/encoder/x86/vp9_sad_sse2.asm', 'source/libvpx/vp9/encoder/x86/vp9_sad_sse3.asm', 'source/libvpx/vp9/encoder/x86/vp9_sad_sse4.asm', 'source/libvpx/vp9/encoder/x86/vp9_sad_ssse3.asm', 'source/libvpx/vp9/encoder/x86/vp9_ssim_opt.asm', 'source/libvpx/vp9/encoder/x86/vp9_subpel_variance.asm', 'source/libvpx/vp9/encoder/x86/vp9_subtract_sse2.asm', 'source/libvpx/vp9/encoder/x86/vp9_temporal_filter_apply_sse2.asm', 'source/libvpx/vp9/encoder/x86/vp9_variance_impl_mmx.asm', 'source/libvpx/vp9/encoder/x86/vp9_variance_impl_sse2.asm', 'source/libvpx/vpx_ports/emms.asm', 'source/libvpx/vpx_ports/x86_abi_support.asm'], 'action': ['$(gyp_shared_intermediate_dir)/yasm', '-D', 'CHROMIUM', '-I', 'source/config/linux/x64', '-I', 'source/config', '-I', 'source/libvpx', '-I', '$(gyp_shared_intermediate_dir)/third_party/libvpx', '-DPIC', '-felf64', '-m', 'amd64', '-o', '$(gyp_shared_intermediate_dir)/third_party/libvpx/%(INPUT_ROOT)s.o', '$(RULE_SOURCES)'], 'message': 'Compile assembly $(RULE_SOURCES)'}":
+# "{'inputs': ['$(gyp_shared_intermediate_dir)/yasm'], 'extension': 'asm', 'process_outputs_as_sources': '1', 'outputs': ['$(gyp_shared_intermediate_dir)/third_party/libvpx/%(INPUT_ROOT)s.o'], 'rule_name': 'assemble', 'rule_sources': ['source/libvpx/third_party/x86inc/x86inc.asm', 'source/libvpx/vp8/common/x86/dequantize_mmx.asm', '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_x86_64.asm', 'source/libvpx/vp8/common/x86/loopfilter_mmx.asm', 'source/libvpx/vp8/common/x86/loopfilter_sse2.asm', '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/recon_mmx.asm', 'source/libvpx/vp8/common/x86/recon_sse2.asm', '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/encoder/x86/dct_mmx.asm', 'source/libvpx/vp8/encoder/x86/dct_sse2.asm', '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/ssim_opt_x86_64.asm', 'source/libvpx/vp8/encoder/x86/subtract_mmx.asm', 'source/libvpx/vp8/encoder/x86/subtract_sse2.asm', 'source/libvpx/vp9/common/x86/vp9_copy_sse2.asm', 'source/libvpx/vp9/common/x86/vp9_idct_ssse3_x86_64.asm', 'source/libvpx/vp9/common/x86/vp9_intrapred_sse2.asm', 'source/libvpx/vp9/common/x86/vp9_intrapred_ssse3.asm', 'source/libvpx/vp9/common/x86/vp9_loopfilter_mmx.asm', 'source/libvpx/vp9/common/x86/vp9_subpixel_8t_sse2.asm', 'source/libvpx/vp9/common/x86/vp9_subpixel_8t_ssse3.asm', 'source/libvpx/vp9/common/x86/vp9_subpixel_bilinear_sse2.asm', 'source/libvpx/vp9/common/x86/vp9_subpixel_bilinear_ssse3.asm', 'source/libvpx/vp9/encoder/x86/vp9_dct_mmx.asm', 'source/libvpx/vp9/encoder/x86/vp9_dct_ssse3_x86_64.asm', 'source/libvpx/vp9/encoder/x86/vp9_error_sse2.asm', 'source/libvpx/vp9/encoder/x86/vp9_quantize_ssse3_x86_64.asm', 'source/libvpx/vp9/encoder/x86/vp9_sad4d_sse2.asm', 'source/libvpx/vp9/encoder/x86/vp9_sad_mmx.asm', 'source/libvpx/vp9/encoder/x86/vp9_sad_sse2.asm', 'source/libvpx/vp9/encoder/x86/vp9_sad_sse3.asm', 'source/libvpx/vp9/encoder/x86/vp9_sad_sse4.asm', 'source/libvpx/vp9/encoder/x86/vp9_sad_ssse3.asm', 'source/libvpx/vp9/encoder/x86/vp9_ssim_opt_x86_64.asm', 'source/libvpx/vp9/encoder/x86/vp9_subpel_variance.asm', 'source/libvpx/vp9/encoder/x86/vp9_subtract_sse2.asm', 'source/libvpx/vp9/encoder/x86/vp9_temporal_filter_apply_sse2.asm', 'source/libvpx/vp9/encoder/x86/vp9_variance_impl_mmx.asm', 'source/libvpx/vp9/encoder/x86/vp9_variance_impl_sse2.asm', 'source/libvpx/vpx_ports/emms.asm', 'source/libvpx/vpx_ports/x86_abi_support.asm'], 'action': ['$(gyp_shared_intermediate_dir)/yasm', '-D', 'CHROMIUM', '-I', 'source/config/linux/x64', '-I', 'source/config', '-I', 'source/libvpx', '-I', '$(gyp_shared_intermediate_dir)/third_party/libvpx', '-D', '__ANDROID__', '-DPIC', '-felf64', '-m', 'amd64', '-o', '$(gyp_shared_intermediate_dir)/third_party/libvpx/%(INPUT_ROOT)s.o', '$(RULE_SOURCES)'], 'message': 'Compile assembly $(RULE_SOURCES)'}":
 $(gyp_shared_intermediate_dir)/third_party/libvpx/x86inc.o: gyp_local_path := $(LOCAL_PATH)
 $(gyp_shared_intermediate_dir)/third_party/libvpx/x86inc.o: gyp_var_prefix := $(GYP_VAR_PREFIX)
 $(gyp_shared_intermediate_dir)/third_party/libvpx/x86inc.o: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/x86inc.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/x86inc.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/x86inc.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/third_party/x86inc/x86inc.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/x86inc.o" source/libvpx/third_party/x86inc/x86inc.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/x86inc.o" source/libvpx/third_party/x86inc/x86inc.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/dequantize_mmx.o: gyp_local_path := $(LOCAL_PATH)
@@ -33,7 +33,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/dequantize_mmx.o: gyp_intermed
 $(gyp_shared_intermediate_dir)/third_party/libvpx/dequantize_mmx.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/dequantize_mmx.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/dequantize_mmx.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/common/x86/dequantize_mmx.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/dequantize_mmx.o" source/libvpx/vp8/common/x86/dequantize_mmx.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/dequantize_mmx.o" source/libvpx/vp8/common/x86/dequantize_mmx.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/idctllm_mmx.o: gyp_local_path := $(LOCAL_PATH)
@@ -42,7 +42,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/idctllm_mmx.o: gyp_intermediat
 $(gyp_shared_intermediate_dir)/third_party/libvpx/idctllm_mmx.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/idctllm_mmx.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/idctllm_mmx.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/common/x86/idctllm_mmx.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/idctllm_mmx.o" source/libvpx/vp8/common/x86/idctllm_mmx.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/idctllm_mmx.o" source/libvpx/vp8/common/x86/idctllm_mmx.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/idctllm_sse2.o: gyp_local_path := $(LOCAL_PATH)
@@ -51,7 +51,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/idctllm_sse2.o: gyp_intermedia
 $(gyp_shared_intermediate_dir)/third_party/libvpx/idctllm_sse2.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/idctllm_sse2.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/idctllm_sse2.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/common/x86/idctllm_sse2.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/idctllm_sse2.o" source/libvpx/vp8/common/x86/idctllm_sse2.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/idctllm_sse2.o" source/libvpx/vp8/common/x86/idctllm_sse2.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/iwalsh_mmx.o: gyp_local_path := $(LOCAL_PATH)
@@ -60,7 +60,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/iwalsh_mmx.o: gyp_intermediate
 $(gyp_shared_intermediate_dir)/third_party/libvpx/iwalsh_mmx.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/iwalsh_mmx.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/iwalsh_mmx.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/common/x86/iwalsh_mmx.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/iwalsh_mmx.o" source/libvpx/vp8/common/x86/iwalsh_mmx.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/iwalsh_mmx.o" source/libvpx/vp8/common/x86/iwalsh_mmx.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/iwalsh_sse2.o: gyp_local_path := $(LOCAL_PATH)
@@ -69,16 +69,16 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/iwalsh_sse2.o: gyp_intermediat
 $(gyp_shared_intermediate_dir)/third_party/libvpx/iwalsh_sse2.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/iwalsh_sse2.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/iwalsh_sse2.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/common/x86/iwalsh_sse2.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/iwalsh_sse2.o" source/libvpx/vp8/common/x86/iwalsh_sse2.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/iwalsh_sse2.o" source/libvpx/vp8/common/x86/iwalsh_sse2.asm
 
 
-$(gyp_shared_intermediate_dir)/third_party/libvpx/loopfilter_block_sse2.o: gyp_local_path := $(LOCAL_PATH)
-$(gyp_shared_intermediate_dir)/third_party/libvpx/loopfilter_block_sse2.o: gyp_var_prefix := $(GYP_VAR_PREFIX)
-$(gyp_shared_intermediate_dir)/third_party/libvpx/loopfilter_block_sse2.o: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir))
-$(gyp_shared_intermediate_dir)/third_party/libvpx/loopfilter_block_sse2.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
-$(gyp_shared_intermediate_dir)/third_party/libvpx/loopfilter_block_sse2.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
-$(gyp_shared_intermediate_dir)/third_party/libvpx/loopfilter_block_sse2.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/common/x86/loopfilter_block_sse2.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/loopfilter_block_sse2.o" source/libvpx/vp8/common/x86/loopfilter_block_sse2.asm
+$(gyp_shared_intermediate_dir)/third_party/libvpx/loopfilter_block_sse2_x86_64.o: gyp_local_path := $(LOCAL_PATH)
+$(gyp_shared_intermediate_dir)/third_party/libvpx/loopfilter_block_sse2_x86_64.o: gyp_var_prefix := $(GYP_VAR_PREFIX)
+$(gyp_shared_intermediate_dir)/third_party/libvpx/loopfilter_block_sse2_x86_64.o: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir))
+$(gyp_shared_intermediate_dir)/third_party/libvpx/loopfilter_block_sse2_x86_64.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
+$(gyp_shared_intermediate_dir)/third_party/libvpx/loopfilter_block_sse2_x86_64.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
+$(gyp_shared_intermediate_dir)/third_party/libvpx/loopfilter_block_sse2_x86_64.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/common/x86/loopfilter_block_sse2_x86_64.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/loopfilter_block_sse2_x86_64.o" source/libvpx/vp8/common/x86/loopfilter_block_sse2_x86_64.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/loopfilter_mmx.o: gyp_local_path := $(LOCAL_PATH)
@@ -87,7 +87,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/loopfilter_mmx.o: gyp_intermed
 $(gyp_shared_intermediate_dir)/third_party/libvpx/loopfilter_mmx.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/loopfilter_mmx.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/loopfilter_mmx.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/common/x86/loopfilter_mmx.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/loopfilter_mmx.o" source/libvpx/vp8/common/x86/loopfilter_mmx.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/loopfilter_mmx.o" source/libvpx/vp8/common/x86/loopfilter_mmx.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/loopfilter_sse2.o: gyp_local_path := $(LOCAL_PATH)
@@ -96,7 +96,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/loopfilter_sse2.o: gyp_interme
 $(gyp_shared_intermediate_dir)/third_party/libvpx/loopfilter_sse2.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/loopfilter_sse2.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/loopfilter_sse2.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/common/x86/loopfilter_sse2.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/loopfilter_sse2.o" source/libvpx/vp8/common/x86/loopfilter_sse2.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/loopfilter_sse2.o" source/libvpx/vp8/common/x86/loopfilter_sse2.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/mfqe_sse2.o: gyp_local_path := $(LOCAL_PATH)
@@ -105,7 +105,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/mfqe_sse2.o: gyp_intermediate_
 $(gyp_shared_intermediate_dir)/third_party/libvpx/mfqe_sse2.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/mfqe_sse2.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/mfqe_sse2.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/common/x86/mfqe_sse2.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/mfqe_sse2.o" source/libvpx/vp8/common/x86/mfqe_sse2.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/mfqe_sse2.o" source/libvpx/vp8/common/x86/mfqe_sse2.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/postproc_mmx.o: gyp_local_path := $(LOCAL_PATH)
@@ -114,7 +114,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/postproc_mmx.o: gyp_intermedia
 $(gyp_shared_intermediate_dir)/third_party/libvpx/postproc_mmx.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/postproc_mmx.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/postproc_mmx.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/common/x86/postproc_mmx.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/postproc_mmx.o" source/libvpx/vp8/common/x86/postproc_mmx.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/postproc_mmx.o" source/libvpx/vp8/common/x86/postproc_mmx.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/postproc_sse2.o: gyp_local_path := $(LOCAL_PATH)
@@ -123,7 +123,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/postproc_sse2.o: gyp_intermedi
 $(gyp_shared_intermediate_dir)/third_party/libvpx/postproc_sse2.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/postproc_sse2.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/postproc_sse2.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/common/x86/postproc_sse2.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/postproc_sse2.o" source/libvpx/vp8/common/x86/postproc_sse2.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/postproc_sse2.o" source/libvpx/vp8/common/x86/postproc_sse2.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/recon_mmx.o: gyp_local_path := $(LOCAL_PATH)
@@ -132,7 +132,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/recon_mmx.o: gyp_intermediate_
 $(gyp_shared_intermediate_dir)/third_party/libvpx/recon_mmx.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/recon_mmx.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/recon_mmx.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/common/x86/recon_mmx.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/recon_mmx.o" source/libvpx/vp8/common/x86/recon_mmx.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/recon_mmx.o" source/libvpx/vp8/common/x86/recon_mmx.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/recon_sse2.o: gyp_local_path := $(LOCAL_PATH)
@@ -141,7 +141,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/recon_sse2.o: gyp_intermediate
 $(gyp_shared_intermediate_dir)/third_party/libvpx/recon_sse2.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/recon_sse2.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/recon_sse2.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/common/x86/recon_sse2.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/recon_sse2.o" source/libvpx/vp8/common/x86/recon_sse2.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/recon_sse2.o" source/libvpx/vp8/common/x86/recon_sse2.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/sad_mmx.o: gyp_local_path := $(LOCAL_PATH)
@@ -150,7 +150,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/sad_mmx.o: gyp_intermediate_di
 $(gyp_shared_intermediate_dir)/third_party/libvpx/sad_mmx.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/sad_mmx.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/sad_mmx.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/common/x86/sad_mmx.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/sad_mmx.o" source/libvpx/vp8/common/x86/sad_mmx.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/sad_mmx.o" source/libvpx/vp8/common/x86/sad_mmx.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/sad_sse2.o: gyp_local_path := $(LOCAL_PATH)
@@ -159,7 +159,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/sad_sse2.o: gyp_intermediate_d
 $(gyp_shared_intermediate_dir)/third_party/libvpx/sad_sse2.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/sad_sse2.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/sad_sse2.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/common/x86/sad_sse2.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/sad_sse2.o" source/libvpx/vp8/common/x86/sad_sse2.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/sad_sse2.o" source/libvpx/vp8/common/x86/sad_sse2.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/sad_sse3.o: gyp_local_path := $(LOCAL_PATH)
@@ -168,7 +168,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/sad_sse3.o: gyp_intermediate_d
 $(gyp_shared_intermediate_dir)/third_party/libvpx/sad_sse3.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/sad_sse3.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/sad_sse3.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/common/x86/sad_sse3.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/sad_sse3.o" source/libvpx/vp8/common/x86/sad_sse3.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/sad_sse3.o" source/libvpx/vp8/common/x86/sad_sse3.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/sad_sse4.o: gyp_local_path := $(LOCAL_PATH)
@@ -177,7 +177,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/sad_sse4.o: gyp_intermediate_d
 $(gyp_shared_intermediate_dir)/third_party/libvpx/sad_sse4.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/sad_sse4.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/sad_sse4.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/common/x86/sad_sse4.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/sad_sse4.o" source/libvpx/vp8/common/x86/sad_sse4.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/sad_sse4.o" source/libvpx/vp8/common/x86/sad_sse4.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/sad_ssse3.o: gyp_local_path := $(LOCAL_PATH)
@@ -186,7 +186,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/sad_ssse3.o: gyp_intermediate_
 $(gyp_shared_intermediate_dir)/third_party/libvpx/sad_ssse3.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/sad_ssse3.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/sad_ssse3.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/common/x86/sad_ssse3.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/sad_ssse3.o" source/libvpx/vp8/common/x86/sad_ssse3.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/sad_ssse3.o" source/libvpx/vp8/common/x86/sad_ssse3.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/subpixel_mmx.o: gyp_local_path := $(LOCAL_PATH)
@@ -195,7 +195,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/subpixel_mmx.o: gyp_intermedia
 $(gyp_shared_intermediate_dir)/third_party/libvpx/subpixel_mmx.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/subpixel_mmx.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/subpixel_mmx.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/common/x86/subpixel_mmx.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/subpixel_mmx.o" source/libvpx/vp8/common/x86/subpixel_mmx.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/subpixel_mmx.o" source/libvpx/vp8/common/x86/subpixel_mmx.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/subpixel_sse2.o: gyp_local_path := $(LOCAL_PATH)
@@ -204,7 +204,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/subpixel_sse2.o: gyp_intermedi
 $(gyp_shared_intermediate_dir)/third_party/libvpx/subpixel_sse2.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/subpixel_sse2.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/subpixel_sse2.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/common/x86/subpixel_sse2.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/subpixel_sse2.o" source/libvpx/vp8/common/x86/subpixel_sse2.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/subpixel_sse2.o" source/libvpx/vp8/common/x86/subpixel_sse2.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/subpixel_ssse3.o: gyp_local_path := $(LOCAL_PATH)
@@ -213,7 +213,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/subpixel_ssse3.o: gyp_intermed
 $(gyp_shared_intermediate_dir)/third_party/libvpx/subpixel_ssse3.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/subpixel_ssse3.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/subpixel_ssse3.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/common/x86/subpixel_ssse3.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/subpixel_ssse3.o" source/libvpx/vp8/common/x86/subpixel_ssse3.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/subpixel_ssse3.o" source/libvpx/vp8/common/x86/subpixel_ssse3.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/variance_impl_mmx.o: gyp_local_path := $(LOCAL_PATH)
@@ -222,7 +222,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/variance_impl_mmx.o: gyp_inter
 $(gyp_shared_intermediate_dir)/third_party/libvpx/variance_impl_mmx.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/variance_impl_mmx.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/variance_impl_mmx.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/common/x86/variance_impl_mmx.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/variance_impl_mmx.o" source/libvpx/vp8/common/x86/variance_impl_mmx.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/variance_impl_mmx.o" source/libvpx/vp8/common/x86/variance_impl_mmx.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/variance_impl_sse2.o: gyp_local_path := $(LOCAL_PATH)
@@ -231,7 +231,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/variance_impl_sse2.o: gyp_inte
 $(gyp_shared_intermediate_dir)/third_party/libvpx/variance_impl_sse2.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/variance_impl_sse2.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/variance_impl_sse2.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/common/x86/variance_impl_sse2.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/variance_impl_sse2.o" source/libvpx/vp8/common/x86/variance_impl_sse2.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/variance_impl_sse2.o" source/libvpx/vp8/common/x86/variance_impl_sse2.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/variance_impl_ssse3.o: gyp_local_path := $(LOCAL_PATH)
@@ -240,7 +240,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/variance_impl_ssse3.o: gyp_int
 $(gyp_shared_intermediate_dir)/third_party/libvpx/variance_impl_ssse3.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/variance_impl_ssse3.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/variance_impl_ssse3.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/common/x86/variance_impl_ssse3.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/variance_impl_ssse3.o" source/libvpx/vp8/common/x86/variance_impl_ssse3.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/variance_impl_ssse3.o" source/libvpx/vp8/common/x86/variance_impl_ssse3.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/dct_mmx.o: gyp_local_path := $(LOCAL_PATH)
@@ -249,7 +249,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/dct_mmx.o: gyp_intermediate_di
 $(gyp_shared_intermediate_dir)/third_party/libvpx/dct_mmx.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/dct_mmx.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/dct_mmx.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/encoder/x86/dct_mmx.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/dct_mmx.o" source/libvpx/vp8/encoder/x86/dct_mmx.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/dct_mmx.o" source/libvpx/vp8/encoder/x86/dct_mmx.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/dct_sse2.o: gyp_local_path := $(LOCAL_PATH)
@@ -258,7 +258,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/dct_sse2.o: gyp_intermediate_d
 $(gyp_shared_intermediate_dir)/third_party/libvpx/dct_sse2.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/dct_sse2.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/dct_sse2.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/encoder/x86/dct_sse2.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/dct_sse2.o" source/libvpx/vp8/encoder/x86/dct_sse2.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/dct_sse2.o" source/libvpx/vp8/encoder/x86/dct_sse2.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/encodeopt.o: gyp_local_path := $(LOCAL_PATH)
@@ -267,7 +267,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/encodeopt.o: gyp_intermediate_
 $(gyp_shared_intermediate_dir)/third_party/libvpx/encodeopt.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/encodeopt.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/encodeopt.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/encoder/x86/encodeopt.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/encodeopt.o" source/libvpx/vp8/encoder/x86/encodeopt.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/encodeopt.o" source/libvpx/vp8/encoder/x86/encodeopt.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/fwalsh_sse2.o: gyp_local_path := $(LOCAL_PATH)
@@ -276,7 +276,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/fwalsh_sse2.o: gyp_intermediat
 $(gyp_shared_intermediate_dir)/third_party/libvpx/fwalsh_sse2.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/fwalsh_sse2.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/fwalsh_sse2.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/encoder/x86/fwalsh_sse2.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/fwalsh_sse2.o" source/libvpx/vp8/encoder/x86/fwalsh_sse2.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/fwalsh_sse2.o" source/libvpx/vp8/encoder/x86/fwalsh_sse2.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/quantize_mmx.o: gyp_local_path := $(LOCAL_PATH)
@@ -285,25 +285,16 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/quantize_mmx.o: gyp_intermedia
 $(gyp_shared_intermediate_dir)/third_party/libvpx/quantize_mmx.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/quantize_mmx.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/quantize_mmx.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/encoder/x86/quantize_mmx.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/quantize_mmx.o" source/libvpx/vp8/encoder/x86/quantize_mmx.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/quantize_mmx.o" source/libvpx/vp8/encoder/x86/quantize_mmx.asm
 
 
-$(gyp_shared_intermediate_dir)/third_party/libvpx/quantize_sse4.o: gyp_local_path := $(LOCAL_PATH)
-$(gyp_shared_intermediate_dir)/third_party/libvpx/quantize_sse4.o: gyp_var_prefix := $(GYP_VAR_PREFIX)
-$(gyp_shared_intermediate_dir)/third_party/libvpx/quantize_sse4.o: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir))
-$(gyp_shared_intermediate_dir)/third_party/libvpx/quantize_sse4.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
-$(gyp_shared_intermediate_dir)/third_party/libvpx/quantize_sse4.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
-$(gyp_shared_intermediate_dir)/third_party/libvpx/quantize_sse4.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/encoder/x86/quantize_sse4.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/quantize_sse4.o" source/libvpx/vp8/encoder/x86/quantize_sse4.asm
-
-
-$(gyp_shared_intermediate_dir)/third_party/libvpx/ssim_opt.o: gyp_local_path := $(LOCAL_PATH)
-$(gyp_shared_intermediate_dir)/third_party/libvpx/ssim_opt.o: gyp_var_prefix := $(GYP_VAR_PREFIX)
-$(gyp_shared_intermediate_dir)/third_party/libvpx/ssim_opt.o: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir))
-$(gyp_shared_intermediate_dir)/third_party/libvpx/ssim_opt.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
-$(gyp_shared_intermediate_dir)/third_party/libvpx/ssim_opt.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
-$(gyp_shared_intermediate_dir)/third_party/libvpx/ssim_opt.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/encoder/x86/ssim_opt.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/ssim_opt.o" source/libvpx/vp8/encoder/x86/ssim_opt.asm
+$(gyp_shared_intermediate_dir)/third_party/libvpx/ssim_opt_x86_64.o: gyp_local_path := $(LOCAL_PATH)
+$(gyp_shared_intermediate_dir)/third_party/libvpx/ssim_opt_x86_64.o: gyp_var_prefix := $(GYP_VAR_PREFIX)
+$(gyp_shared_intermediate_dir)/third_party/libvpx/ssim_opt_x86_64.o: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir))
+$(gyp_shared_intermediate_dir)/third_party/libvpx/ssim_opt_x86_64.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
+$(gyp_shared_intermediate_dir)/third_party/libvpx/ssim_opt_x86_64.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
+$(gyp_shared_intermediate_dir)/third_party/libvpx/ssim_opt_x86_64.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/encoder/x86/ssim_opt_x86_64.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/ssim_opt_x86_64.o" source/libvpx/vp8/encoder/x86/ssim_opt_x86_64.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/subtract_mmx.o: gyp_local_path := $(LOCAL_PATH)
@@ -312,7 +303,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/subtract_mmx.o: gyp_intermedia
 $(gyp_shared_intermediate_dir)/third_party/libvpx/subtract_mmx.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/subtract_mmx.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/subtract_mmx.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/encoder/x86/subtract_mmx.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/subtract_mmx.o" source/libvpx/vp8/encoder/x86/subtract_mmx.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/subtract_mmx.o" source/libvpx/vp8/encoder/x86/subtract_mmx.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/subtract_sse2.o: gyp_local_path := $(LOCAL_PATH)
@@ -321,7 +312,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/subtract_sse2.o: gyp_intermedi
 $(gyp_shared_intermediate_dir)/third_party/libvpx/subtract_sse2.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/subtract_sse2.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/subtract_sse2.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/encoder/x86/subtract_sse2.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/subtract_sse2.o" source/libvpx/vp8/encoder/x86/subtract_sse2.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/subtract_sse2.o" source/libvpx/vp8/encoder/x86/subtract_sse2.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_copy_sse2.o: gyp_local_path := $(LOCAL_PATH)
@@ -330,16 +321,16 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_copy_sse2.o: gyp_intermedi
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_copy_sse2.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_copy_sse2.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_copy_sse2.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp9/common/x86/vp9_copy_sse2.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_copy_sse2.o" source/libvpx/vp9/common/x86/vp9_copy_sse2.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_copy_sse2.o" source/libvpx/vp9/common/x86/vp9_copy_sse2.asm
 
 
-$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_idct_ssse3.o: gyp_local_path := $(LOCAL_PATH)
-$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_idct_ssse3.o: gyp_var_prefix := $(GYP_VAR_PREFIX)
-$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_idct_ssse3.o: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir))
-$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_idct_ssse3.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
-$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_idct_ssse3.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
-$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_idct_ssse3.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp9/common/x86/vp9_idct_ssse3.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_idct_ssse3.o" source/libvpx/vp9/common/x86/vp9_idct_ssse3.asm
+$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_idct_ssse3_x86_64.o: gyp_local_path := $(LOCAL_PATH)
+$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_idct_ssse3_x86_64.o: gyp_var_prefix := $(GYP_VAR_PREFIX)
+$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_idct_ssse3_x86_64.o: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir))
+$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_idct_ssse3_x86_64.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
+$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_idct_ssse3_x86_64.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
+$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_idct_ssse3_x86_64.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp9/common/x86/vp9_idct_ssse3_x86_64.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_idct_ssse3_x86_64.o" source/libvpx/vp9/common/x86/vp9_idct_ssse3_x86_64.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_intrapred_sse2.o: gyp_local_path := $(LOCAL_PATH)
@@ -348,7 +339,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_intrapred_sse2.o: gyp_inte
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_intrapred_sse2.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_intrapred_sse2.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_intrapred_sse2.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp9/common/x86/vp9_intrapred_sse2.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_intrapred_sse2.o" source/libvpx/vp9/common/x86/vp9_intrapred_sse2.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_intrapred_sse2.o" source/libvpx/vp9/common/x86/vp9_intrapred_sse2.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_intrapred_ssse3.o: gyp_local_path := $(LOCAL_PATH)
@@ -357,7 +348,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_intrapred_ssse3.o: gyp_int
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_intrapred_ssse3.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_intrapred_ssse3.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_intrapred_ssse3.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp9/common/x86/vp9_intrapred_ssse3.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_intrapred_ssse3.o" source/libvpx/vp9/common/x86/vp9_intrapred_ssse3.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_intrapred_ssse3.o" source/libvpx/vp9/common/x86/vp9_intrapred_ssse3.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_loopfilter_mmx.o: gyp_local_path := $(LOCAL_PATH)
@@ -366,7 +357,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_loopfilter_mmx.o: gyp_inte
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_loopfilter_mmx.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_loopfilter_mmx.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_loopfilter_mmx.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp9/common/x86/vp9_loopfilter_mmx.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_loopfilter_mmx.o" source/libvpx/vp9/common/x86/vp9_loopfilter_mmx.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_loopfilter_mmx.o" source/libvpx/vp9/common/x86/vp9_loopfilter_mmx.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_8t_sse2.o: gyp_local_path := $(LOCAL_PATH)
@@ -375,7 +366,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_8t_sse2.o: gyp_in
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_8t_sse2.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_8t_sse2.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_8t_sse2.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp9/common/x86/vp9_subpixel_8t_sse2.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_8t_sse2.o" source/libvpx/vp9/common/x86/vp9_subpixel_8t_sse2.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_8t_sse2.o" source/libvpx/vp9/common/x86/vp9_subpixel_8t_sse2.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_8t_ssse3.o: gyp_local_path := $(LOCAL_PATH)
@@ -384,7 +375,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_8t_ssse3.o: gyp_i
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_8t_ssse3.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_8t_ssse3.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_8t_ssse3.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp9/common/x86/vp9_subpixel_8t_ssse3.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_8t_ssse3.o" source/libvpx/vp9/common/x86/vp9_subpixel_8t_ssse3.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_8t_ssse3.o" source/libvpx/vp9/common/x86/vp9_subpixel_8t_ssse3.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_bilinear_sse2.o: gyp_local_path := $(LOCAL_PATH)
@@ -393,7 +384,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_bilinear_sse2.o:
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_bilinear_sse2.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_bilinear_sse2.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_bilinear_sse2.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp9/common/x86/vp9_subpixel_bilinear_sse2.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_bilinear_sse2.o" source/libvpx/vp9/common/x86/vp9_subpixel_bilinear_sse2.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_bilinear_sse2.o" source/libvpx/vp9/common/x86/vp9_subpixel_bilinear_sse2.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_bilinear_ssse3.o: gyp_local_path := $(LOCAL_PATH)
@@ -402,7 +393,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_bilinear_ssse3.o:
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_bilinear_ssse3.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_bilinear_ssse3.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_bilinear_ssse3.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp9/common/x86/vp9_subpixel_bilinear_ssse3.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_bilinear_ssse3.o" source/libvpx/vp9/common/x86/vp9_subpixel_bilinear_ssse3.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_bilinear_ssse3.o" source/libvpx/vp9/common/x86/vp9_subpixel_bilinear_ssse3.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_dct_mmx.o: gyp_local_path := $(LOCAL_PATH)
@@ -411,16 +402,16 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_dct_mmx.o: gyp_intermediat
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_dct_mmx.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_dct_mmx.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_dct_mmx.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_dct_mmx.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_dct_mmx.o" source/libvpx/vp9/encoder/x86/vp9_dct_mmx.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_dct_mmx.o" source/libvpx/vp9/encoder/x86/vp9_dct_mmx.asm
 
 
-$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_dct_ssse3.o: gyp_local_path := $(LOCAL_PATH)
-$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_dct_ssse3.o: gyp_var_prefix := $(GYP_VAR_PREFIX)
-$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_dct_ssse3.o: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir))
-$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_dct_ssse3.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
-$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_dct_ssse3.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
-$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_dct_ssse3.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_dct_ssse3.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_dct_ssse3.o" source/libvpx/vp9/encoder/x86/vp9_dct_ssse3.asm
+$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_dct_ssse3_x86_64.o: gyp_local_path := $(LOCAL_PATH)
+$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_dct_ssse3_x86_64.o: gyp_var_prefix := $(GYP_VAR_PREFIX)
+$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_dct_ssse3_x86_64.o: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir))
+$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_dct_ssse3_x86_64.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
+$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_dct_ssse3_x86_64.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
+$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_dct_ssse3_x86_64.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_dct_ssse3_x86_64.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_dct_ssse3_x86_64.o" source/libvpx/vp9/encoder/x86/vp9_dct_ssse3_x86_64.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_error_sse2.o: gyp_local_path := $(LOCAL_PATH)
@@ -429,16 +420,16 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_error_sse2.o: gyp_intermed
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_error_sse2.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_error_sse2.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_error_sse2.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_error_sse2.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_error_sse2.o" source/libvpx/vp9/encoder/x86/vp9_error_sse2.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_error_sse2.o" source/libvpx/vp9/encoder/x86/vp9_error_sse2.asm
 
 
-$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_quantize_ssse3.o: gyp_local_path := $(LOCAL_PATH)
-$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_quantize_ssse3.o: gyp_var_prefix := $(GYP_VAR_PREFIX)
-$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_quantize_ssse3.o: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir))
-$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_quantize_ssse3.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
-$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_quantize_ssse3.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
-$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_quantize_ssse3.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_quantize_ssse3.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_quantize_ssse3.o" source/libvpx/vp9/encoder/x86/vp9_quantize_ssse3.asm
+$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_quantize_ssse3_x86_64.o: gyp_local_path := $(LOCAL_PATH)
+$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_quantize_ssse3_x86_64.o: gyp_var_prefix := $(GYP_VAR_PREFIX)
+$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_quantize_ssse3_x86_64.o: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir))
+$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_quantize_ssse3_x86_64.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
+$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_quantize_ssse3_x86_64.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
+$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_quantize_ssse3_x86_64.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_quantize_ssse3_x86_64.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_quantize_ssse3_x86_64.o" source/libvpx/vp9/encoder/x86/vp9_quantize_ssse3_x86_64.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad4d_sse2.o: gyp_local_path := $(LOCAL_PATH)
@@ -447,7 +438,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad4d_sse2.o: gyp_intermed
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad4d_sse2.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad4d_sse2.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad4d_sse2.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_sad4d_sse2.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad4d_sse2.o" source/libvpx/vp9/encoder/x86/vp9_sad4d_sse2.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad4d_sse2.o" source/libvpx/vp9/encoder/x86/vp9_sad4d_sse2.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_mmx.o: gyp_local_path := $(LOCAL_PATH)
@@ -456,7 +447,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_mmx.o: gyp_intermediat
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_mmx.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_mmx.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_mmx.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_sad_mmx.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_mmx.o" source/libvpx/vp9/encoder/x86/vp9_sad_mmx.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_mmx.o" source/libvpx/vp9/encoder/x86/vp9_sad_mmx.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_sse2.o: gyp_local_path := $(LOCAL_PATH)
@@ -465,7 +456,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_sse2.o: gyp_intermedia
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_sse2.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_sse2.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_sse2.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_sad_sse2.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_sse2.o" source/libvpx/vp9/encoder/x86/vp9_sad_sse2.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_sse2.o" source/libvpx/vp9/encoder/x86/vp9_sad_sse2.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_sse3.o: gyp_local_path := $(LOCAL_PATH)
@@ -474,7 +465,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_sse3.o: gyp_intermedia
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_sse3.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_sse3.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_sse3.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_sad_sse3.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_sse3.o" source/libvpx/vp9/encoder/x86/vp9_sad_sse3.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_sse3.o" source/libvpx/vp9/encoder/x86/vp9_sad_sse3.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_sse4.o: gyp_local_path := $(LOCAL_PATH)
@@ -483,7 +474,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_sse4.o: gyp_intermedia
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_sse4.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_sse4.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_sse4.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_sad_sse4.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_sse4.o" source/libvpx/vp9/encoder/x86/vp9_sad_sse4.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_sse4.o" source/libvpx/vp9/encoder/x86/vp9_sad_sse4.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_ssse3.o: gyp_local_path := $(LOCAL_PATH)
@@ -492,16 +483,16 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_ssse3.o: gyp_intermedi
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_ssse3.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_ssse3.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_ssse3.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_sad_ssse3.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_ssse3.o" source/libvpx/vp9/encoder/x86/vp9_sad_ssse3.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_ssse3.o" source/libvpx/vp9/encoder/x86/vp9_sad_ssse3.asm
 
 
-$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_ssim_opt.o: gyp_local_path := $(LOCAL_PATH)
-$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_ssim_opt.o: gyp_var_prefix := $(GYP_VAR_PREFIX)
-$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_ssim_opt.o: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir))
-$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_ssim_opt.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
-$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_ssim_opt.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
-$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_ssim_opt.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_ssim_opt.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_ssim_opt.o" source/libvpx/vp9/encoder/x86/vp9_ssim_opt.asm
+$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_ssim_opt_x86_64.o: gyp_local_path := $(LOCAL_PATH)
+$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_ssim_opt_x86_64.o: gyp_var_prefix := $(GYP_VAR_PREFIX)
+$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_ssim_opt_x86_64.o: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir))
+$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_ssim_opt_x86_64.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
+$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_ssim_opt_x86_64.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
+$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_ssim_opt_x86_64.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_ssim_opt_x86_64.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_ssim_opt_x86_64.o" source/libvpx/vp9/encoder/x86/vp9_ssim_opt_x86_64.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpel_variance.o: gyp_local_path := $(LOCAL_PATH)
@@ -510,7 +501,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpel_variance.o: gyp_int
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpel_variance.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpel_variance.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpel_variance.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_subpel_variance.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpel_variance.o" source/libvpx/vp9/encoder/x86/vp9_subpel_variance.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpel_variance.o" source/libvpx/vp9/encoder/x86/vp9_subpel_variance.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subtract_sse2.o: gyp_local_path := $(LOCAL_PATH)
@@ -519,7 +510,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subtract_sse2.o: gyp_inter
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subtract_sse2.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subtract_sse2.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subtract_sse2.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_subtract_sse2.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subtract_sse2.o" source/libvpx/vp9/encoder/x86/vp9_subtract_sse2.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subtract_sse2.o" source/libvpx/vp9/encoder/x86/vp9_subtract_sse2.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_temporal_filter_apply_sse2.o: gyp_local_path := $(LOCAL_PATH)
@@ -528,7 +519,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_temporal_filter_apply_sse2
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_temporal_filter_apply_sse2.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_temporal_filter_apply_sse2.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_temporal_filter_apply_sse2.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_temporal_filter_apply_sse2.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_temporal_filter_apply_sse2.o" source/libvpx/vp9/encoder/x86/vp9_temporal_filter_apply_sse2.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_temporal_filter_apply_sse2.o" source/libvpx/vp9/encoder/x86/vp9_temporal_filter_apply_sse2.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_variance_impl_mmx.o: gyp_local_path := $(LOCAL_PATH)
@@ -537,7 +528,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_variance_impl_mmx.o: gyp_i
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_variance_impl_mmx.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_variance_impl_mmx.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_variance_impl_mmx.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_variance_impl_mmx.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_variance_impl_mmx.o" source/libvpx/vp9/encoder/x86/vp9_variance_impl_mmx.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_variance_impl_mmx.o" source/libvpx/vp9/encoder/x86/vp9_variance_impl_mmx.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_variance_impl_sse2.o: gyp_local_path := $(LOCAL_PATH)
@@ -546,7 +537,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_variance_impl_sse2.o: gyp_
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_variance_impl_sse2.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_variance_impl_sse2.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_variance_impl_sse2.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_variance_impl_sse2.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_variance_impl_sse2.o" source/libvpx/vp9/encoder/x86/vp9_variance_impl_sse2.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_variance_impl_sse2.o" source/libvpx/vp9/encoder/x86/vp9_variance_impl_sse2.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/emms.o: gyp_local_path := $(LOCAL_PATH)
@@ -555,7 +546,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/emms.o: gyp_intermediate_dir :
 $(gyp_shared_intermediate_dir)/third_party/libvpx/emms.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/emms.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/emms.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vpx_ports/emms.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/emms.o" source/libvpx/vpx_ports/emms.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/emms.o" source/libvpx/vpx_ports/emms.asm
 
 
 $(gyp_shared_intermediate_dir)/third_party/libvpx/x86_abi_support.o: gyp_local_path := $(LOCAL_PATH)
@@ -564,7 +555,7 @@ $(gyp_shared_intermediate_dir)/third_party/libvpx/x86_abi_support.o: gyp_interme
 $(gyp_shared_intermediate_dir)/third_party/libvpx/x86_abi_support.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/x86_abi_support.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
 $(gyp_shared_intermediate_dir)/third_party/libvpx/x86_abi_support.o: $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vpx_ports/x86_abi_support.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
-	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/x86_abi_support.o" source/libvpx/vpx_ports/x86_abi_support.asm
+	mkdir -p $(gyp_shared_intermediate_dir)/third_party/libvpx; cd $(gyp_local_path)/third_party/libvpx; "$(gyp_shared_intermediate_dir)/yasm" -D CHROMIUM -I source/config/linux/x64 -I source/config -I source/libvpx -I "$(gyp_shared_intermediate_dir)/third_party/libvpx" -D __ANDROID__ -DPIC -felf64 -m amd64 -o "$(gyp_shared_intermediate_dir)/third_party/libvpx/x86_abi_support.o" source/libvpx/vpx_ports/x86_abi_support.asm
 
 
 
@@ -575,7 +566,7 @@ GYP_GENERATED_OUTPUTS := \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/idctllm_sse2.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/iwalsh_mmx.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/iwalsh_sse2.o \
-	$(gyp_shared_intermediate_dir)/third_party/libvpx/loopfilter_block_sse2.o \
+	$(gyp_shared_intermediate_dir)/third_party/libvpx/loopfilter_block_sse2_x86_64.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/loopfilter_mmx.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/loopfilter_sse2.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/mfqe_sse2.o \
@@ -599,12 +590,11 @@ GYP_GENERATED_OUTPUTS := \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/encodeopt.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/fwalsh_sse2.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/quantize_mmx.o \
-	$(gyp_shared_intermediate_dir)/third_party/libvpx/quantize_sse4.o \
-	$(gyp_shared_intermediate_dir)/third_party/libvpx/ssim_opt.o \
+	$(gyp_shared_intermediate_dir)/third_party/libvpx/ssim_opt_x86_64.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/subtract_mmx.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/subtract_sse2.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_copy_sse2.o \
-	$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_idct_ssse3.o \
+	$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_idct_ssse3_x86_64.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_intrapred_sse2.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_intrapred_ssse3.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_loopfilter_mmx.o \
@@ -613,16 +603,16 @@ GYP_GENERATED_OUTPUTS := \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_bilinear_sse2.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_bilinear_ssse3.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_dct_mmx.o \
-	$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_dct_ssse3.o \
+	$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_dct_ssse3_x86_64.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_error_sse2.o \
-	$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_quantize_ssse3.o \
+	$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_quantize_ssse3_x86_64.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad4d_sse2.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_mmx.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_sse2.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_sse3.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_sse4.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_ssse3.o \
-	$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_ssim_opt.o \
+	$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_ssim_opt_x86_64.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpel_variance.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subtract_sse2.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_temporal_filter_apply_sse2.o \
@@ -641,7 +631,7 @@ LOCAL_GENERATED_SOURCES := \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/idctllm_sse2.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/iwalsh_mmx.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/iwalsh_sse2.o \
-	$(gyp_shared_intermediate_dir)/third_party/libvpx/loopfilter_block_sse2.o \
+	$(gyp_shared_intermediate_dir)/third_party/libvpx/loopfilter_block_sse2_x86_64.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/loopfilter_mmx.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/loopfilter_sse2.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/mfqe_sse2.o \
@@ -665,12 +655,11 @@ LOCAL_GENERATED_SOURCES := \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/encodeopt.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/fwalsh_sse2.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/quantize_mmx.o \
-	$(gyp_shared_intermediate_dir)/third_party/libvpx/quantize_sse4.o \
-	$(gyp_shared_intermediate_dir)/third_party/libvpx/ssim_opt.o \
+	$(gyp_shared_intermediate_dir)/third_party/libvpx/ssim_opt_x86_64.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/subtract_mmx.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/subtract_sse2.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_copy_sse2.o \
-	$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_idct_ssse3.o \
+	$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_idct_ssse3_x86_64.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_intrapred_sse2.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_intrapred_ssse3.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_loopfilter_mmx.o \
@@ -679,16 +668,16 @@ LOCAL_GENERATED_SOURCES := \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_bilinear_sse2.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpixel_bilinear_ssse3.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_dct_mmx.o \
-	$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_dct_ssse3.o \
+	$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_dct_ssse3_x86_64.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_error_sse2.o \
-	$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_quantize_ssse3.o \
+	$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_quantize_ssse3_x86_64.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad4d_sse2.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_mmx.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_sse2.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_sse3.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_sse4.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_sad_ssse3.o \
-	$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_ssim_opt.o \
+	$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_ssim_opt_x86_64.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subpel_variance.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_subtract_sse2.o \
 	$(gyp_shared_intermediate_dir)/third_party/libvpx/vp9_temporal_filter_apply_sse2.o \
@@ -731,7 +720,6 @@ LOCAL_SRC_FILES := \
 	third_party/libvpx/source/libvpx/vp8/common/variance_c.c \
 	third_party/libvpx/source/libvpx/vp8/common/x86/filter_x86.c \
 	third_party/libvpx/source/libvpx/vp8/common/x86/loopfilter_x86.c \
-	third_party/libvpx/source/libvpx/vp8/common/x86/postproc_x86.c \
 	third_party/libvpx/source/libvpx/vp8/common/x86/vp8_asm_stubs.c \
 	third_party/libvpx/source/libvpx/vp8/decoder/dboolhuff.c \
 	third_party/libvpx/source/libvpx/vp8/decoder/decodeframe.c \
@@ -832,7 +820,6 @@ LOCAL_SRC_FILES := \
 	third_party/libvpx/source/libvpx/vp9/encoder/vp9_writer.c \
 	third_party/libvpx/source/libvpx/vp9/vp9_cx_iface.c \
 	third_party/libvpx/source/libvpx/vp9/vp9_dx_iface.c \
-	third_party/libvpx/source/libvpx/vpx/src/svc_encodeframe.c \
 	third_party/libvpx/source/libvpx/vpx/src/vpx_codec.c \
 	third_party/libvpx/source/libvpx/vpx/src/vpx_decoder.c \
 	third_party/libvpx/source/libvpx/vpx/src/vpx_encoder.c \
@@ -900,6 +887,7 @@ MY_DEFS_Debug := \
 	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DCLD_DATA_FROM_STATIC' \
 	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
@@ -941,6 +929,9 @@ LOCAL_CPPFLAGS_Debug := \
 	-fno-threadsafe-statics \
 	-fvisibility-inlines-hidden \
 	-Wno-deprecated \
+	-std=gnu++11 \
+	-Wno-narrowing \
+	-Wno-literal-suffix \
 	-Wno-non-virtual-dtor \
 	-Wno-sign-promo \
 	-Wno-non-virtual-dtor
@@ -1000,6 +991,7 @@ MY_DEFS_Release := \
 	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DCLD_DATA_FROM_STATIC' \
 	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
@@ -1041,6 +1033,9 @@ LOCAL_CPPFLAGS_Release := \
 	-fno-threadsafe-statics \
 	-fvisibility-inlines-hidden \
 	-Wno-deprecated \
+	-std=gnu++11 \
+	-Wno-narrowing \
+	-Wno-literal-suffix \
 	-Wno-non-virtual-dtor \
 	-Wno-sign-promo \
 	-Wno-non-virtual-dtor
diff --git a/libvpx_asm_offsets_vp8.target.darwin-arm.mk b/libvpx_asm_offsets_vp8.target.darwin-arm.mk
index 0bad677..4c2c673 100644
--- a/libvpx_asm_offsets_vp8.target.darwin-arm.mk
+++ b/libvpx_asm_offsets_vp8.target.darwin-arm.mk
@@ -86,6 +86,7 @@ MY_DEFS_Debug := \
 	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DCLD_DATA_FROM_STATIC' \
 	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
@@ -124,6 +125,9 @@ LOCAL_CPPFLAGS_Debug := \
 	-fvisibility-inlines-hidden \
 	-Wno-deprecated \
 	-Wno-abi \
+	-std=gnu++11 \
+	-Wno-narrowing \
+	-Wno-literal-suffix \
 	-Wno-non-virtual-dtor \
 	-Wno-sign-promo \
 	-Wno-non-virtual-dtor
@@ -189,6 +193,7 @@ MY_DEFS_Release := \
 	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DCLD_DATA_FROM_STATIC' \
 	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
@@ -227,6 +232,9 @@ LOCAL_CPPFLAGS_Release := \
 	-fvisibility-inlines-hidden \
 	-Wno-deprecated \
 	-Wno-abi \
+	-std=gnu++11 \
+	-Wno-narrowing \
+	-Wno-literal-suffix \
 	-Wno-non-virtual-dtor \
 	-Wno-sign-promo \
 	-Wno-non-virtual-dtor
diff --git a/libvpx_asm_offsets_vp8.target.darwin-arm64.mk b/libvpx_asm_offsets_vp8.target.darwin-arm64.mk
index 57a5126..a2def50 100644
--- a/libvpx_asm_offsets_vp8.target.darwin-arm64.mk
+++ b/libvpx_asm_offsets_vp8.target.darwin-arm64.mk
@@ -76,6 +76,7 @@ MY_DEFS_Debug := \
 	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DCLD_DATA_FROM_STATIC' \
 	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
@@ -113,6 +114,9 @@ LOCAL_CPPFLAGS_Debug := \
 	-fno-threadsafe-statics \
 	-fvisibility-inlines-hidden \
 	-Wno-deprecated \
+	-std=gnu++11 \
+	-Wno-narrowing \
+	-Wno-literal-suffix \
 	-Wno-non-virtual-dtor \
 	-Wno-sign-promo \
 	-Wno-non-virtual-dtor
@@ -168,6 +172,7 @@ MY_DEFS_Release := \
 	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DCLD_DATA_FROM_STATIC' \
 	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
@@ -205,6 +210,9 @@ LOCAL_CPPFLAGS_Release := \
 	-fno-threadsafe-statics \
 	-fvisibility-inlines-hidden \
 	-Wno-deprecated \
+	-std=gnu++11 \
+	-Wno-narrowing \
+	-Wno-literal-suffix \
 	-Wno-non-virtual-dtor \
 	-Wno-sign-promo \
 	-Wno-non-virtual-dtor
diff --git a/libvpx_asm_offsets_vp8.target.darwin-x86.mk b/libvpx_asm_offsets_vp8.target.darwin-x86.mk
index b8071e0..ad39f8f 100644
--- a/libvpx_asm_offsets_vp8.target.darwin-x86.mk
+++ b/libvpx_asm_offsets_vp8.target.darwin-x86.mk
@@ -81,6 +81,7 @@ MY_DEFS_Debug := \
 	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DCLD_DATA_FROM_STATIC' \
 	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
@@ -118,6 +119,9 @@ LOCAL_CPPFLAGS_Debug := \
 	-fno-threadsafe-statics \
 	-fvisibility-inlines-hidden \
 	-Wno-deprecated \
+	-std=gnu++11 \
+	-Wno-narrowing \
+	-Wno-literal-suffix \
 	-Wno-non-virtual-dtor \
 	-Wno-sign-promo \
 	-Wno-non-virtual-dtor
@@ -178,6 +182,7 @@ MY_DEFS_Release := \
 	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DCLD_DATA_FROM_STATIC' \
 	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
@@ -215,6 +220,9 @@ LOCAL_CPPFLAGS_Release := \
 	-fno-threadsafe-statics \
 	-fvisibility-inlines-hidden \
 	-Wno-deprecated \
+	-std=gnu++11 \
+	-Wno-narrowing \
+	-Wno-literal-suffix \
 	-Wno-non-virtual-dtor \
 	-Wno-sign-promo \
 	-Wno-non-virtual-dtor
diff --git a/libvpx_asm_offsets_vp8.target.darwin-x86_64.mk b/libvpx_asm_offsets_vp8.target.darwin-x86_64.mk
index 76d374e..b6074a7 100644
--- a/libvpx_asm_offsets_vp8.target.darwin-x86_64.mk
+++ b/libvpx_asm_offsets_vp8.target.darwin-x86_64.mk
@@ -80,6 +80,7 @@ MY_DEFS_Debug := \
 	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DCLD_DATA_FROM_STATIC' \
 	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
@@ -117,6 +118,9 @@ LOCAL_CPPFLAGS_Debug := \
 	-fno-threadsafe-statics \
 	-fvisibility-inlines-hidden \
 	-Wno-deprecated \
+	-std=gnu++11 \
+	-Wno-narrowing \
+	-Wno-literal-suffix \
 	-Wno-non-virtual-dtor \
 	-Wno-sign-promo \
 	-Wno-non-virtual-dtor
@@ -176,6 +180,7 @@ MY_DEFS_Release := \
 	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DCLD_DATA_FROM_STATIC' \
 	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
@@ -213,6 +218,9 @@ LOCAL_CPPFLAGS_Release := \
 	-fno-threadsafe-statics \
 	-fvisibility-inlines-hidden \
 	-Wno-deprecated \
+	-std=gnu++11 \
+	-Wno-narrowing \
+	-Wno-literal-suffix \
 	-Wno-non-virtual-dtor \
 	-Wno-sign-promo \
 	-Wno-non-virtual-dtor
diff --git a/libvpx_asm_offsets_vp8.target.linux-arm.mk b/libvpx_asm_offsets_vp8.target.linux-arm.mk
index 0bad677..4c2c673 100644
--- a/libvpx_asm_offsets_vp8.target.linux-arm.mk
+++ b/libvpx_asm_offsets_vp8.target.linux-arm.mk
@@ -86,6 +86,7 @@ MY_DEFS_Debug := \
 	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DCLD_DATA_FROM_STATIC' \
 	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
@@ -124,6 +125,9 @@ LOCAL_CPPFLAGS_Debug := \
 	-fvisibility-inlines-hidden \
 	-Wno-deprecated \
 	-Wno-abi \
+	-std=gnu++11 \
+	-Wno-narrowing \
+	-Wno-literal-suffix \
 	-Wno-non-virtual-dtor \
 	-Wno-sign-promo \
 	-Wno-non-virtual-dtor
@@ -189,6 +193,7 @@ MY_DEFS_Release := \
 	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DCLD_DATA_FROM_STATIC' \
 	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
@@ -227,6 +232,9 @@ LOCAL_CPPFLAGS_Release := \
 	-fvisibility-inlines-hidden \
 	-Wno-deprecated \
 	-Wno-abi \
+	-std=gnu++11 \
+	-Wno-narrowing \
+	-Wno-literal-suffix \
 	-Wno-non-virtual-dtor \
 	-Wno-sign-promo \
 	-Wno-non-virtual-dtor
diff --git a/libvpx_asm_offsets_vp8.target.linux-arm64.mk b/libvpx_asm_offsets_vp8.target.linux-arm64.mk
index 57a5126..a2def50 100644
--- a/libvpx_asm_offsets_vp8.target.linux-arm64.mk
+++ b/libvpx_asm_offsets_vp8.target.linux-arm64.mk
@@ -76,6 +76,7 @@ MY_DEFS_Debug := \
 	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DCLD_DATA_FROM_STATIC' \
 	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
@@ -113,6 +114,9 @@ LOCAL_CPPFLAGS_Debug := \
 	-fno-threadsafe-statics \
 	-fvisibility-inlines-hidden \
 	-Wno-deprecated \
+	-std=gnu++11 \
+	-Wno-narrowing \
+	-Wno-literal-suffix \
 	-Wno-non-virtual-dtor \
 	-Wno-sign-promo \
 	-Wno-non-virtual-dtor
@@ -168,6 +172,7 @@ MY_DEFS_Release := \
 	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DCLD_DATA_FROM_STATIC' \
 	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
@@ -205,6 +210,9 @@ LOCAL_CPPFLAGS_Release := \
 	-fno-threadsafe-statics \
 	-fvisibility-inlines-hidden \
 	-Wno-deprecated \
+	-std=gnu++11 \
+	-Wno-narrowing \
+	-Wno-literal-suffix \
 	-Wno-non-virtual-dtor \
 	-Wno-sign-promo \
 	-Wno-non-virtual-dtor
diff --git a/libvpx_asm_offsets_vp8.target.linux-x86.mk b/libvpx_asm_offsets_vp8.target.linux-x86.mk
index b8071e0..ad39f8f 100644
--- a/libvpx_asm_offsets_vp8.target.linux-x86.mk
+++ b/libvpx_asm_offsets_vp8.target.linux-x86.mk
@@ -81,6 +81,7 @@ MY_DEFS_Debug := \
 	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DCLD_DATA_FROM_STATIC' \
 	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
@@ -118,6 +119,9 @@ LOCAL_CPPFLAGS_Debug := \
 	-fno-threadsafe-statics \
 	-fvisibility-inlines-hidden \
 	-Wno-deprecated \
+	-std=gnu++11 \
+	-Wno-narrowing \
+	-Wno-literal-suffix \
 	-Wno-non-virtual-dtor \
 	-Wno-sign-promo \
 	-Wno-non-virtual-dtor
@@ -178,6 +182,7 @@ MY_DEFS_Release := \
 	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DCLD_DATA_FROM_STATIC' \
 	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
@@ -215,6 +220,9 @@ LOCAL_CPPFLAGS_Release := \
 	-fno-threadsafe-statics \
 	-fvisibility-inlines-hidden \
 	-Wno-deprecated \
+	-std=gnu++11 \
+	-Wno-narrowing \
+	-Wno-literal-suffix \
 	-Wno-non-virtual-dtor \
 	-Wno-sign-promo \
 	-Wno-non-virtual-dtor
diff --git a/libvpx_asm_offsets_vp8.target.linux-x86_64.mk b/libvpx_asm_offsets_vp8.target.linux-x86_64.mk
index 76d374e..b6074a7 100644
--- a/libvpx_asm_offsets_vp8.target.linux-x86_64.mk
+++ b/libvpx_asm_offsets_vp8.target.linux-x86_64.mk
@@ -80,6 +80,7 @@ MY_DEFS_Debug := \
 	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DCLD_DATA_FROM_STATIC' \
 	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
@@ -117,6 +118,9 @@ LOCAL_CPPFLAGS_Debug := \
 	-fno-threadsafe-statics \
 	-fvisibility-inlines-hidden \
 	-Wno-deprecated \
+	-std=gnu++11 \
+	-Wno-narrowing \
+	-Wno-literal-suffix \
 	-Wno-non-virtual-dtor \
 	-Wno-sign-promo \
 	-Wno-non-virtual-dtor
@@ -176,6 +180,7 @@ MY_DEFS_Release := \
 	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DCLD_DATA_FROM_STATIC' \
 	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
@@ -213,6 +218,9 @@ LOCAL_CPPFLAGS_Release := \
 	-fno-threadsafe-statics \
 	-fvisibility-inlines-hidden \
 	-Wno-deprecated \
+	-std=gnu++11 \
+	-Wno-narrowing \
+	-Wno-literal-suffix \
 	-Wno-non-virtual-dtor \
 	-Wno-sign-promo \
 	-Wno-non-virtual-dtor
diff --git a/libvpx_asm_offsets_vpx_scale.target.darwin-arm.mk b/libvpx_asm_offsets_vpx_scale.target.darwin-arm.mk
index ac98d5b..973b4f3 100644
--- a/libvpx_asm_offsets_vpx_scale.target.darwin-arm.mk
+++ b/libvpx_asm_offsets_vpx_scale.target.darwin-arm.mk
@@ -86,6 +86,7 @@ MY_DEFS_Debug := \
 	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DCLD_DATA_FROM_STATIC' \
 	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
@@ -124,6 +125,9 @@ LOCAL_CPPFLAGS_Debug := \
 	-fvisibility-inlines-hidden \
 	-Wno-deprecated \
 	-Wno-abi \
+	-std=gnu++11 \
+	-Wno-narrowing \
+	-Wno-literal-suffix \
 	-Wno-non-virtual-dtor \
 	-Wno-sign-promo \
 	-Wno-non-virtual-dtor
@@ -189,6 +193,7 @@ MY_DEFS_Release := \
 	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DCLD_DATA_FROM_STATIC' \
 	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
@@ -227,6 +232,9 @@ LOCAL_CPPFLAGS_Release := \
 	-fvisibility-inlines-hidden \
 	-Wno-deprecated \
 	-Wno-abi \
+	-std=gnu++11 \
+	-Wno-narrowing \
+	-Wno-literal-suffix \
 	-Wno-non-virtual-dtor \
 	-Wno-sign-promo \
 	-Wno-non-virtual-dtor
diff --git a/libvpx_asm_offsets_vpx_scale.target.linux-arm.mk b/libvpx_asm_offsets_vpx_scale.target.linux-arm.mk
index ac98d5b..973b4f3 100644
--- a/libvpx_asm_offsets_vpx_scale.target.linux-arm.mk
+++ b/libvpx_asm_offsets_vpx_scale.target.linux-arm.mk
@@ -86,6 +86,7 @@ MY_DEFS_Debug := \
 	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DCLD_DATA_FROM_STATIC' \
 	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
@@ -124,6 +125,9 @@ LOCAL_CPPFLAGS_Debug := \
 	-fvisibility-inlines-hidden \
 	-Wno-deprecated \
 	-Wno-abi \
+	-std=gnu++11 \
+	-Wno-narrowing \
+	-Wno-literal-suffix \
 	-Wno-non-virtual-dtor \
 	-Wno-sign-promo \
 	-Wno-non-virtual-dtor
@@ -189,6 +193,7 @@ MY_DEFS_Release := \
 	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DCLD_DATA_FROM_STATIC' \
 	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
@@ -227,6 +232,9 @@ LOCAL_CPPFLAGS_Release := \
 	-fvisibility-inlines-hidden \
 	-Wno-deprecated \
 	-Wno-abi \
+	-std=gnu++11 \
+	-Wno-narrowing \
+	-Wno-literal-suffix \
 	-Wno-non-virtual-dtor \
 	-Wno-sign-promo \
 	-Wno-non-virtual-dtor
diff --git a/libvpx_intrinsics_mmx.target.darwin-x86.mk b/libvpx_intrinsics_mmx.target.darwin-x86.mk
index 608386f..11f59e3 100644
--- a/libvpx_intrinsics_mmx.target.darwin-x86.mk
+++ b/libvpx_intrinsics_mmx.target.darwin-x86.mk
@@ -85,6 +85,7 @@ MY_DEFS_Debug := \
 	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DCLD_DATA_FROM_STATIC' \
 	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
@@ -121,6 +122,9 @@ LOCAL_CPPFLAGS_Debug := \
 	-fno-threadsafe-statics \
 	-fvisibility-inlines-hidden \
 	-Wno-deprecated \
+	-std=gnu++11 \
+	-Wno-narrowing \
+	-Wno-literal-suffix \
 	-Wno-non-virtual-dtor \
 	-Wno-sign-promo \
 	-Wno-non-virtual-dtor
@@ -182,6 +186,7 @@ MY_DEFS_Release := \
 	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DCLD_DATA_FROM_STATIC' \
 	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
@@ -218,6 +223,9 @@ LOCAL_CPPFLAGS_Release := \
 	-fno-threadsafe-statics \
 	-fvisibility-inlines-hidden \
 	-Wno-deprecated \
+	-std=gnu++11 \
+	-Wno-narrowing \
+	-Wno-literal-suffix \
 	-Wno-non-virtual-dtor \
 	-Wno-sign-promo \
 	-Wno-non-virtual-dtor
diff --git a/libvpx_intrinsics_mmx.target.darwin-x86_64.mk b/libvpx_intrinsics_mmx.target.darwin-x86_64.mk
index 9196673..8283495 100644
--- a/libvpx_intrinsics_mmx.target.darwin-x86_64.mk
+++ b/libvpx_intrinsics_mmx.target.darwin-x86_64.mk
@@ -84,6 +84,7 @@ MY_DEFS_Debug := \
 	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DCLD_DATA_FROM_STATIC' \
 	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
@@ -120,6 +121,9 @@ LOCAL_CPPFLAGS_Debug := \
 	-fno-threadsafe-statics \
 	-fvisibility-inlines-hidden \
 	-Wno-deprecated \
+	-std=gnu++11 \
+	-Wno-narrowing \
+	-Wno-literal-suffix \
 	-Wno-non-virtual-dtor \
 	-Wno-sign-promo \
 	-Wno-non-virtual-dtor
@@ -180,6 +184,7 @@ MY_DEFS_Release := \
 	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DCLD_DATA_FROM_STATIC' \
 	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
@@ -216,6 +221,9 @@ LOCAL_CPPFLAGS_Release := \
 	-fno-threadsafe-statics \
 	-fvisibility-inlines-hidden \
 	-Wno-deprecated \
+	-std=gnu++11 \
+	-Wno-narrowing \
+	-Wno-literal-suffix \
 	-Wno-non-virtual-dtor \
 	-Wno-sign-promo \
 	-Wno-non-virtual-dtor
diff --git a/libvpx_intrinsics_mmx.target.linux-x86.mk b/libvpx_intrinsics_mmx.target.linux-x86.mk
index 608386f..11f59e3 100644
--- a/libvpx_intrinsics_mmx.target.linux-x86.mk
+++ b/libvpx_intrinsics_mmx.target.linux-x86.mk
@@ -85,6 +85,7 @@ MY_DEFS_Debug := \
 	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DCLD_DATA_FROM_STATIC' \
 	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
@@ -121,6 +122,9 @@ LOCAL_CPPFLAGS_Debug := \
 	-fno-threadsafe-statics \
 	-fvisibility-inlines-hidden \
 	-Wno-deprecated \
+	-std=gnu++11 \
+	-Wno-narrowing \
+	-Wno-literal-suffix \
 	-Wno-non-virtual-dtor \
 	-Wno-sign-promo \
 	-Wno-non-virtual-dtor
@@ -182,6 +186,7 @@ MY_DEFS_Release := \
 	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DCLD_DATA_FROM_STATIC' \
 	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
@@ -218,6 +223,9 @@ LOCAL_CPPFLAGS_Release := \
 	-fno-threadsafe-statics \
 	-fvisibility-inlines-hidden \
 	-Wno-deprecated \
+	-std=gnu++11 \
+	-Wno-narrowing \
+	-Wno-literal-suffix \
 	-Wno-non-virtual-dtor \
 	-Wno-sign-promo \
 	-Wno-non-virtual-dtor
diff --git a/libvpx_intrinsics_mmx.target.linux-x86_64.mk b/libvpx_intrinsics_mmx.target.linux-x86_64.mk
index 9196673..8283495 100644
--- a/libvpx_intrinsics_mmx.target.linux-x86_64.mk
+++ b/libvpx_intrinsics_mmx.target.linux-x86_64.mk
@@ -84,6 +84,7 @@ MY_DEFS_Debug := \
 	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DCLD_DATA_FROM_STATIC' \
 	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
@@ -120,6 +121,9 @@ LOCAL_CPPFLAGS_Debug := \
 	-fno-threadsafe-statics \
 	-fvisibility-inlines-hidden \
 	-Wno-deprecated \
+	-std=gnu++11 \
+	-Wno-narrowing \
+	-Wno-literal-suffix \
 	-Wno-non-virtual-dtor \
 	-Wno-sign-promo \
 	-Wno-non-virtual-dtor
@@ -180,6 +184,7 @@ MY_DEFS_Release := \
 	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DCLD_DATA_FROM_STATIC' \
 	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
@@ -216,6 +221,9 @@ LOCAL_CPPFLAGS_Release := \
 	-fno-threadsafe-statics \
 	-fvisibility-inlines-hidden \
 	-Wno-deprecated \
+	-std=gnu++11 \
+	-Wno-narrowing \
+	-Wno-literal-suffix \
 	-Wno-non-virtual-dtor \
 	-Wno-sign-promo \
 	-Wno-non-virtual-dtor
diff --git a/libvpx_intrinsics_neon.target.darwin-arm.mk b/libvpx_intrinsics_neon.target.darwin-arm.mk
index 0741fd7..f7af8d6 100644
--- a/libvpx_intrinsics_neon.target.darwin-arm.mk
+++ b/libvpx_intrinsics_neon.target.darwin-arm.mk
@@ -103,6 +103,7 @@ MY_DEFS_Debug := \
 	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DCLD_DATA_FROM_STATIC' \
 	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
@@ -140,6 +141,9 @@ LOCAL_CPPFLAGS_Debug := \
 	-fvisibility-inlines-hidden \
 	-Wno-deprecated \
 	-Wno-abi \
+	-std=gnu++11 \
+	-Wno-narrowing \
+	-Wno-literal-suffix \
 	-Wno-non-virtual-dtor \
 	-Wno-sign-promo \
 	-Wno-non-virtual-dtor
@@ -206,6 +210,7 @@ MY_DEFS_Release := \
 	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DCLD_DATA_FROM_STATIC' \
 	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
@@ -243,6 +248,9 @@ LOCAL_CPPFLAGS_Release := \
 	-fvisibility-inlines-hidden \
 	-Wno-deprecated \
 	-Wno-abi \
+	-std=gnu++11 \
+	-Wno-narrowing \
+	-Wno-literal-suffix \
 	-Wno-non-virtual-dtor \
 	-Wno-sign-promo \
 	-Wno-non-virtual-dtor
diff --git a/libvpx_intrinsics_neon.target.linux-arm.mk b/libvpx_intrinsics_neon.target.linux-arm.mk
index 0741fd7..f7af8d6 100644
--- a/libvpx_intrinsics_neon.target.linux-arm.mk
+++ b/libvpx_intrinsics_neon.target.linux-arm.mk
@@ -103,6 +103,7 @@ MY_DEFS_Debug := \
 	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DCLD_DATA_FROM_STATIC' \
 	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
@@ -140,6 +141,9 @@ LOCAL_CPPFLAGS_Debug := \
 	-fvisibility-inlines-hidden \
 	-Wno-deprecated \
 	-Wno-abi \
+	-std=gnu++11 \
+	-Wno-narrowing \
+	-Wno-literal-suffix \
 	-Wno-non-virtual-dtor \
 	-Wno-sign-promo \
 	-Wno-non-virtual-dtor
@@ -206,6 +210,7 @@ MY_DEFS_Release := \
 	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DCLD_DATA_FROM_STATIC' \
 	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
@@ -243,6 +248,9 @@ LOCAL_CPPFLAGS_Release := \
 	-fvisibility-inlines-hidden \
 	-Wno-deprecated \
 	-Wno-abi \
+	-std=gnu++11 \
+	-Wno-narrowing \
+	-Wno-literal-suffix \
 	-Wno-non-virtual-dtor \
 	-Wno-sign-promo \
 	-Wno-non-virtual-dtor
diff --git a/libvpx_intrinsics_sse2.target.darwin-x86.mk b/libvpx_intrinsics_sse2.target.darwin-x86.mk
index f4984b1..6ae76a1 100644
--- a/libvpx_intrinsics_sse2.target.darwin-x86.mk
+++ b/libvpx_intrinsics_sse2.target.darwin-x86.mk
@@ -92,6 +92,7 @@ MY_DEFS_Debug := \
 	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DCLD_DATA_FROM_STATIC' \
 	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
@@ -128,6 +129,9 @@ LOCAL_CPPFLAGS_Debug := \
 	-fno-threadsafe-statics \
 	-fvisibility-inlines-hidden \
 	-Wno-deprecated \
+	-std=gnu++11 \
+	-Wno-narrowing \
+	-Wno-literal-suffix \
 	-Wno-non-virtual-dtor \
 	-Wno-sign-promo \
 	-Wno-non-virtual-dtor
@@ -189,6 +193,7 @@ MY_DEFS_Release := \
 	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DCLD_DATA_FROM_STATIC' \
 	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
@@ -225,6 +230,9 @@ LOCAL_CPPFLAGS_Release := \
 	-fno-threadsafe-statics \
 	-fvisibility-inlines-hidden \
 	-Wno-deprecated \
+	-std=gnu++11 \
+	-Wno-narrowing \
+	-Wno-literal-suffix \
 	-Wno-non-virtual-dtor \
 	-Wno-sign-promo \
 	-Wno-non-virtual-dtor
diff --git a/libvpx_intrinsics_sse2.target.darwin-x86_64.mk b/libvpx_intrinsics_sse2.target.darwin-x86_64.mk
index 00c1863..010d4bc 100644
--- a/libvpx_intrinsics_sse2.target.darwin-x86_64.mk
+++ b/libvpx_intrinsics_sse2.target.darwin-x86_64.mk
@@ -91,6 +91,7 @@ MY_DEFS_Debug := \
 	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DCLD_DATA_FROM_STATIC' \
 	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
@@ -127,6 +128,9 @@ LOCAL_CPPFLAGS_Debug := \
 	-fno-threadsafe-statics \
 	-fvisibility-inlines-hidden \
 	-Wno-deprecated \
+	-std=gnu++11 \
+	-Wno-narrowing \
+	-Wno-literal-suffix \
 	-Wno-non-virtual-dtor \
 	-Wno-sign-promo \
 	-Wno-non-virtual-dtor
@@ -187,6 +191,7 @@ MY_DEFS_Release := \
 	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DCLD_DATA_FROM_STATIC' \
 	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
@@ -223,6 +228,9 @@ LOCAL_CPPFLAGS_Release := \
 	-fno-threadsafe-statics \
 	-fvisibility-inlines-hidden \
 	-Wno-deprecated \
+	-std=gnu++11 \
+	-Wno-narrowing \
+	-Wno-literal-suffix \
 	-Wno-non-virtual-dtor \
 	-Wno-sign-promo \
 	-Wno-non-virtual-dtor
diff --git a/libvpx_intrinsics_sse2.target.linux-x86.mk b/libvpx_intrinsics_sse2.target.linux-x86.mk
index f4984b1..6ae76a1 100644
--- a/libvpx_intrinsics_sse2.target.linux-x86.mk
+++ b/libvpx_intrinsics_sse2.target.linux-x86.mk
@@ -92,6 +92,7 @@ MY_DEFS_Debug := \
 	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DCLD_DATA_FROM_STATIC' \
 	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
@@ -128,6 +129,9 @@ LOCAL_CPPFLAGS_Debug := \
 	-fno-threadsafe-statics \
 	-fvisibility-inlines-hidden \
 	-Wno-deprecated \
+	-std=gnu++11 \
+	-Wno-narrowing \
+	-Wno-literal-suffix \
 	-Wno-non-virtual-dtor \
 	-Wno-sign-promo \
 	-Wno-non-virtual-dtor
@@ -189,6 +193,7 @@ MY_DEFS_Release := \
 	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DCLD_DATA_FROM_STATIC' \
 	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
@@ -225,6 +230,9 @@ LOCAL_CPPFLAGS_Release := \
 	-fno-threadsafe-statics \
 	-fvisibility-inlines-hidden \
 	-Wno-deprecated \
+	-std=gnu++11 \
+	-Wno-narrowing \
+	-Wno-literal-suffix \
 	-Wno-non-virtual-dtor \
 	-Wno-sign-promo \
 	-Wno-non-virtual-dtor
diff --git a/libvpx_intrinsics_sse2.target.linux-x86_64.mk b/libvpx_intrinsics_sse2.target.linux-x86_64.mk
index 00c1863..010d4bc 100644
--- a/libvpx_intrinsics_sse2.target.linux-x86_64.mk
+++ b/libvpx_intrinsics_sse2.target.linux-x86_64.mk
@@ -91,6 +91,7 @@ MY_DEFS_Debug := \
 	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DCLD_DATA_FROM_STATIC' \
 	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
@@ -127,6 +128,9 @@ LOCAL_CPPFLAGS_Debug := \
 	-fno-threadsafe-statics \
 	-fvisibility-inlines-hidden \
 	-Wno-deprecated \
+	-std=gnu++11 \
+	-Wno-narrowing \
+	-Wno-literal-suffix \
 	-Wno-non-virtual-dtor \
 	-Wno-sign-promo \
 	-Wno-non-virtual-dtor
@@ -187,6 +191,7 @@ MY_DEFS_Release := \
 	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DCLD_DATA_FROM_STATIC' \
 	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
@@ -223,6 +228,9 @@ LOCAL_CPPFLAGS_Release := \
 	-fno-threadsafe-statics \
 	-fvisibility-inlines-hidden \
 	-Wno-deprecated \
+	-std=gnu++11 \
+	-Wno-narrowing \
+	-Wno-literal-suffix \
 	-Wno-non-virtual-dtor \
 	-Wno-sign-promo \
 	-Wno-non-virtual-dtor
diff --git a/libvpx_intrinsics_sse4_1.target.darwin-x86.mk b/libvpx_intrinsics_sse4_1.target.darwin-x86.mk
new file mode 100644
index 0000000..6eec602
--- /dev/null
+++ b/libvpx_intrinsics_sse4_1.target.darwin-x86.mk
@@ -0,0 +1,289 @@
+# This file is generated by gyp; do not edit.
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE_CLASS := STATIC_LIBRARIES
+LOCAL_MODULE := third_party_libvpx_libvpx_intrinsics_sse4_1_gyp
+LOCAL_MODULE_SUFFIX := .a
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH)
+gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX))
+gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX))
+
+# Make sure our deps are built first.
+GYP_TARGET_DEPENDENCIES :=
+
+GYP_GENERATED_OUTPUTS :=
+
+# Make sure our deps and generated files are built first.
+LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
+
+LOCAL_GENERATED_SOURCES :=
+
+GYP_COPIED_SOURCE_ORIGIN_DIRS :=
+
+LOCAL_SRC_FILES := \
+	third_party/libvpx/source/libvpx/vp8/encoder/x86/quantize_sse4.c
+
+
+# Flags passed to both C and C++ files.
+MY_CFLAGS_Debug := \
+	--param=ssp-buffer-size=4 \
+	-fno-exceptions \
+	-fno-strict-aliasing \
+	-Wno-unused-parameter \
+	-Wno-missing-field-initializers \
+	-fvisibility=hidden \
+	-pipe \
+	-fPIC \
+	-Wno-unused-local-typedefs \
+	-msse4.1 \
+	-Wno-format \
+	-msse2 \
+	-mfpmath=sse \
+	-mmmx \
+	-m32 \
+	-ffunction-sections \
+	-funwind-tables \
+	-g \
+	-fno-short-enums \
+	-finline-limit=64 \
+	-Wa,--noexecstack \
+	-U_FORTIFY_SOURCE \
+	-Wno-extra \
+	-Wno-ignored-qualifiers \
+	-Wno-type-limits \
+	-Wno-unused-but-set-variable \
+	-fno-stack-protector \
+	-Wno-address \
+	-Wno-format-security \
+	-Wno-return-type \
+	-Wno-sequence-point \
+	-Os \
+	-g \
+	-fomit-frame-pointer \
+	-fdata-sections \
+	-ffunction-sections \
+	-funwind-tables
+
+MY_DEFS_Debug := \
+	'-DV8_DEPRECATION_WARNINGS' \
+	'-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \
+	'-D_FILE_OFFSET_BITS=64' \
+	'-DNO_TCMALLOC' \
+	'-DDISABLE_NACL' \
+	'-DCHROMIUM_BUILD' \
+	'-DUSE_LIBJPEG_TURBO=1' \
+	'-DENABLE_WEBRTC=1' \
+	'-DUSE_PROPRIETARY_CODECS' \
+	'-DENABLE_BROWSER_CDMS' \
+	'-DENABLE_CONFIGURATION_POLICY' \
+	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
+	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
+	'-DENABLE_EGLIMAGE=1' \
+	'-DCLD_VERSION=1' \
+	'-DCLD_DATA_FROM_STATIC' \
+	'-DENABLE_PRINTING=1' \
+	'-DENABLE_MANAGED_USERS=1' \
+	'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
+	'-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \
+	'-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \
+	'-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \
+	'-DDATA_REDUCTION_PROXY_WARMUP_URL="http://www.gstatic.com/generate_204"' \
+	'-DVIDEO_HOLE=1' \
+	'-DUSE_OPENSSL=1' \
+	'-DUSE_OPENSSL_CERTS=1' \
+	'-DANDROID' \
+	'-D__GNU_SOURCE=1' \
+	'-DUSE_STLPORT=1' \
+	'-D_STLP_USE_PTR_SPECIALIZATIONS=1' \
+	'-DCHROME_BUILD_ID=""' \
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
+	'-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \
+	'-D_DEBUG'
+
+
+# Include paths placed before CFLAGS/CPPFLAGS
+LOCAL_C_INCLUDES_Debug := \
+	$(gyp_shared_intermediate_dir) \
+	$(LOCAL_PATH)/third_party/libvpx/source/config/linux/ia32 \
+	$(LOCAL_PATH)/third_party/libvpx/source/libvpx \
+	$(PWD)/frameworks/wilhelm/include \
+	$(PWD)/bionic \
+	$(PWD)/external/stlport/stlport
+
+
+# Flags passed to only C++ (and not C) files.
+LOCAL_CPPFLAGS_Debug := \
+	-fno-rtti \
+	-fno-threadsafe-statics \
+	-fvisibility-inlines-hidden \
+	-Wno-deprecated \
+	-std=gnu++11 \
+	-Wno-narrowing \
+	-Wno-literal-suffix \
+	-Wno-non-virtual-dtor \
+	-Wno-sign-promo \
+	-Wno-non-virtual-dtor
+
+
+# Flags passed to both C and C++ files.
+MY_CFLAGS_Release := \
+	--param=ssp-buffer-size=4 \
+	-fno-exceptions \
+	-fno-strict-aliasing \
+	-Wno-unused-parameter \
+	-Wno-missing-field-initializers \
+	-fvisibility=hidden \
+	-pipe \
+	-fPIC \
+	-Wno-unused-local-typedefs \
+	-msse4.1 \
+	-Wno-format \
+	-msse2 \
+	-mfpmath=sse \
+	-mmmx \
+	-m32 \
+	-ffunction-sections \
+	-funwind-tables \
+	-g \
+	-fno-short-enums \
+	-finline-limit=64 \
+	-Wa,--noexecstack \
+	-U_FORTIFY_SOURCE \
+	-Wno-extra \
+	-Wno-ignored-qualifiers \
+	-Wno-type-limits \
+	-Wno-unused-but-set-variable \
+	-fno-stack-protector \
+	-Wno-address \
+	-Wno-format-security \
+	-Wno-return-type \
+	-Wno-sequence-point \
+	-Os \
+	-fno-ident \
+	-fdata-sections \
+	-ffunction-sections \
+	-fomit-frame-pointer \
+	-funwind-tables
+
+MY_DEFS_Release := \
+	'-DV8_DEPRECATION_WARNINGS' \
+	'-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \
+	'-D_FILE_OFFSET_BITS=64' \
+	'-DNO_TCMALLOC' \
+	'-DDISABLE_NACL' \
+	'-DCHROMIUM_BUILD' \
+	'-DUSE_LIBJPEG_TURBO=1' \
+	'-DENABLE_WEBRTC=1' \
+	'-DUSE_PROPRIETARY_CODECS' \
+	'-DENABLE_BROWSER_CDMS' \
+	'-DENABLE_CONFIGURATION_POLICY' \
+	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
+	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
+	'-DENABLE_EGLIMAGE=1' \
+	'-DCLD_VERSION=1' \
+	'-DCLD_DATA_FROM_STATIC' \
+	'-DENABLE_PRINTING=1' \
+	'-DENABLE_MANAGED_USERS=1' \
+	'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
+	'-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \
+	'-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \
+	'-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \
+	'-DDATA_REDUCTION_PROXY_WARMUP_URL="http://www.gstatic.com/generate_204"' \
+	'-DVIDEO_HOLE=1' \
+	'-DUSE_OPENSSL=1' \
+	'-DUSE_OPENSSL_CERTS=1' \
+	'-DANDROID' \
+	'-D__GNU_SOURCE=1' \
+	'-DUSE_STLPORT=1' \
+	'-D_STLP_USE_PTR_SPECIALIZATIONS=1' \
+	'-DCHROME_BUILD_ID=""' \
+	'-DNDEBUG' \
+	'-DNVALGRIND' \
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
+
+
+# Include paths placed before CFLAGS/CPPFLAGS
+LOCAL_C_INCLUDES_Release := \
+	$(gyp_shared_intermediate_dir) \
+	$(LOCAL_PATH)/third_party/libvpx/source/config/linux/ia32 \
+	$(LOCAL_PATH)/third_party/libvpx/source/libvpx \
+	$(PWD)/frameworks/wilhelm/include \
+	$(PWD)/bionic \
+	$(PWD)/external/stlport/stlport
+
+
+# Flags passed to only C++ (and not C) files.
+LOCAL_CPPFLAGS_Release := \
+	-fno-rtti \
+	-fno-threadsafe-statics \
+	-fvisibility-inlines-hidden \
+	-Wno-deprecated \
+	-std=gnu++11 \
+	-Wno-narrowing \
+	-Wno-literal-suffix \
+	-Wno-non-virtual-dtor \
+	-Wno-sign-promo \
+	-Wno-non-virtual-dtor
+
+
+LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
+LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
+LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
+LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
+### Rules for final target.
+
+LOCAL_LDFLAGS_Debug := \
+	-Wl,-z,now \
+	-Wl,-z,relro \
+	-Wl,--fatal-warnings \
+	-Wl,-z,noexecstack \
+	-fPIC \
+	-m32 \
+	-fuse-ld=gold \
+	-nostdlib \
+	-Wl,--no-undefined \
+	-Wl,--exclude-libs=ALL \
+	-Wl,--warn-shared-textrel \
+	-Wl,-O1 \
+	-Wl,--as-needed
+
+
+LOCAL_LDFLAGS_Release := \
+	-Wl,-z,now \
+	-Wl,-z,relro \
+	-Wl,--fatal-warnings \
+	-Wl,-z,noexecstack \
+	-fPIC \
+	-m32 \
+	-fuse-ld=gold \
+	-nostdlib \
+	-Wl,--no-undefined \
+	-Wl,--exclude-libs=ALL \
+	-Wl,-O1 \
+	-Wl,--as-needed \
+	-Wl,--gc-sections \
+	-Wl,--warn-shared-textrel
+
+
+LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
+
+LOCAL_STATIC_LIBRARIES :=
+
+# Enable grouping to fix circular references
+LOCAL_GROUP_STATIC_LIBRARIES := true
+
+LOCAL_SHARED_LIBRARIES := \
+	libstlport \
+	libdl
+
+# Add target alias to "gyp_all_modules" target.
+.PHONY: gyp_all_modules
+gyp_all_modules: third_party_libvpx_libvpx_intrinsics_sse4_1_gyp
+
+# Alias gyp target name.
+.PHONY: libvpx_intrinsics_sse4_1
+libvpx_intrinsics_sse4_1: third_party_libvpx_libvpx_intrinsics_sse4_1_gyp
+
+include $(BUILD_STATIC_LIBRARY)
diff --git a/libvpx_intrinsics_sse4_1.target.darwin-x86_64.mk b/libvpx_intrinsics_sse4_1.target.darwin-x86_64.mk
new file mode 100644
index 0000000..9f993c3
--- /dev/null
+++ b/libvpx_intrinsics_sse4_1.target.darwin-x86_64.mk
@@ -0,0 +1,287 @@
+# This file is generated by gyp; do not edit.
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE_CLASS := STATIC_LIBRARIES
+LOCAL_MODULE := third_party_libvpx_libvpx_intrinsics_sse4_1_gyp
+LOCAL_MODULE_SUFFIX := .a
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH)
+gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX))
+gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX))
+
+# Make sure our deps are built first.
+GYP_TARGET_DEPENDENCIES :=
+
+GYP_GENERATED_OUTPUTS :=
+
+# Make sure our deps and generated files are built first.
+LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
+
+LOCAL_GENERATED_SOURCES :=
+
+GYP_COPIED_SOURCE_ORIGIN_DIRS :=
+
+LOCAL_SRC_FILES := \
+	third_party/libvpx/source/libvpx/vp8/encoder/x86/quantize_sse4.c
+
+
+# Flags passed to both C and C++ files.
+MY_CFLAGS_Debug := \
+	-fstack-protector \
+	--param=ssp-buffer-size=4 \
+	-fno-exceptions \
+	-fno-strict-aliasing \
+	-Wno-unused-parameter \
+	-Wno-missing-field-initializers \
+	-fvisibility=hidden \
+	-pipe \
+	-fPIC \
+	-Wno-unused-local-typedefs \
+	-msse4.1 \
+	-Wno-format \
+	-m64 \
+	-march=x86-64 \
+	-ffunction-sections \
+	-funwind-tables \
+	-g \
+	-fstack-protector \
+	-fno-short-enums \
+	-finline-limit=64 \
+	-Wa,--noexecstack \
+	-U_FORTIFY_SOURCE \
+	-Wno-extra \
+	-Wno-ignored-qualifiers \
+	-Wno-type-limits \
+	-Wno-unused-but-set-variable \
+	-Wno-address \
+	-Wno-format-security \
+	-Wno-return-type \
+	-Wno-sequence-point \
+	-Os \
+	-g \
+	-fomit-frame-pointer \
+	-fdata-sections \
+	-ffunction-sections \
+	-funwind-tables
+
+MY_DEFS_Debug := \
+	'-DV8_DEPRECATION_WARNINGS' \
+	'-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \
+	'-D_FILE_OFFSET_BITS=64' \
+	'-DNO_TCMALLOC' \
+	'-DDISABLE_NACL' \
+	'-DCHROMIUM_BUILD' \
+	'-DUSE_LIBJPEG_TURBO=1' \
+	'-DENABLE_WEBRTC=1' \
+	'-DUSE_PROPRIETARY_CODECS' \
+	'-DENABLE_BROWSER_CDMS' \
+	'-DENABLE_CONFIGURATION_POLICY' \
+	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
+	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
+	'-DENABLE_EGLIMAGE=1' \
+	'-DCLD_VERSION=1' \
+	'-DCLD_DATA_FROM_STATIC' \
+	'-DENABLE_PRINTING=1' \
+	'-DENABLE_MANAGED_USERS=1' \
+	'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
+	'-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \
+	'-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \
+	'-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \
+	'-DDATA_REDUCTION_PROXY_WARMUP_URL="http://www.gstatic.com/generate_204"' \
+	'-DVIDEO_HOLE=1' \
+	'-DUSE_OPENSSL=1' \
+	'-DUSE_OPENSSL_CERTS=1' \
+	'-DANDROID' \
+	'-D__GNU_SOURCE=1' \
+	'-DUSE_STLPORT=1' \
+	'-D_STLP_USE_PTR_SPECIALIZATIONS=1' \
+	'-DCHROME_BUILD_ID=""' \
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
+	'-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \
+	'-D_DEBUG'
+
+
+# Include paths placed before CFLAGS/CPPFLAGS
+LOCAL_C_INCLUDES_Debug := \
+	$(gyp_shared_intermediate_dir) \
+	$(LOCAL_PATH)/third_party/libvpx/source/config/linux/x64 \
+	$(LOCAL_PATH)/third_party/libvpx/source/libvpx \
+	$(PWD)/frameworks/wilhelm/include \
+	$(PWD)/bionic \
+	$(PWD)/external/stlport/stlport
+
+
+# Flags passed to only C++ (and not C) files.
+LOCAL_CPPFLAGS_Debug := \
+	-fno-rtti \
+	-fno-threadsafe-statics \
+	-fvisibility-inlines-hidden \
+	-Wno-deprecated \
+	-std=gnu++11 \
+	-Wno-narrowing \
+	-Wno-literal-suffix \
+	-Wno-non-virtual-dtor \
+	-Wno-sign-promo \
+	-Wno-non-virtual-dtor
+
+
+# Flags passed to both C and C++ files.
+MY_CFLAGS_Release := \
+	-fstack-protector \
+	--param=ssp-buffer-size=4 \
+	-fno-exceptions \
+	-fno-strict-aliasing \
+	-Wno-unused-parameter \
+	-Wno-missing-field-initializers \
+	-fvisibility=hidden \
+	-pipe \
+	-fPIC \
+	-Wno-unused-local-typedefs \
+	-msse4.1 \
+	-Wno-format \
+	-m64 \
+	-march=x86-64 \
+	-ffunction-sections \
+	-funwind-tables \
+	-g \
+	-fstack-protector \
+	-fno-short-enums \
+	-finline-limit=64 \
+	-Wa,--noexecstack \
+	-U_FORTIFY_SOURCE \
+	-Wno-extra \
+	-Wno-ignored-qualifiers \
+	-Wno-type-limits \
+	-Wno-unused-but-set-variable \
+	-Wno-address \
+	-Wno-format-security \
+	-Wno-return-type \
+	-Wno-sequence-point \
+	-Os \
+	-fno-ident \
+	-fdata-sections \
+	-ffunction-sections \
+	-fomit-frame-pointer \
+	-funwind-tables
+
+MY_DEFS_Release := \
+	'-DV8_DEPRECATION_WARNINGS' \
+	'-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \
+	'-D_FILE_OFFSET_BITS=64' \
+	'-DNO_TCMALLOC' \
+	'-DDISABLE_NACL' \
+	'-DCHROMIUM_BUILD' \
+	'-DUSE_LIBJPEG_TURBO=1' \
+	'-DENABLE_WEBRTC=1' \
+	'-DUSE_PROPRIETARY_CODECS' \
+	'-DENABLE_BROWSER_CDMS' \
+	'-DENABLE_CONFIGURATION_POLICY' \
+	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
+	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
+	'-DENABLE_EGLIMAGE=1' \
+	'-DCLD_VERSION=1' \
+	'-DCLD_DATA_FROM_STATIC' \
+	'-DENABLE_PRINTING=1' \
+	'-DENABLE_MANAGED_USERS=1' \
+	'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
+	'-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \
+	'-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \
+	'-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \
+	'-DDATA_REDUCTION_PROXY_WARMUP_URL="http://www.gstatic.com/generate_204"' \
+	'-DVIDEO_HOLE=1' \
+	'-DUSE_OPENSSL=1' \
+	'-DUSE_OPENSSL_CERTS=1' \
+	'-DANDROID' \
+	'-D__GNU_SOURCE=1' \
+	'-DUSE_STLPORT=1' \
+	'-D_STLP_USE_PTR_SPECIALIZATIONS=1' \
+	'-DCHROME_BUILD_ID=""' \
+	'-DNDEBUG' \
+	'-DNVALGRIND' \
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
+
+
+# Include paths placed before CFLAGS/CPPFLAGS
+LOCAL_C_INCLUDES_Release := \
+	$(gyp_shared_intermediate_dir) \
+	$(LOCAL_PATH)/third_party/libvpx/source/config/linux/x64 \
+	$(LOCAL_PATH)/third_party/libvpx/source/libvpx \
+	$(PWD)/frameworks/wilhelm/include \
+	$(PWD)/bionic \
+	$(PWD)/external/stlport/stlport
+
+
+# Flags passed to only C++ (and not C) files.
+LOCAL_CPPFLAGS_Release := \
+	-fno-rtti \
+	-fno-threadsafe-statics \
+	-fvisibility-inlines-hidden \
+	-Wno-deprecated \
+	-std=gnu++11 \
+	-Wno-narrowing \
+	-Wno-literal-suffix \
+	-Wno-non-virtual-dtor \
+	-Wno-sign-promo \
+	-Wno-non-virtual-dtor
+
+
+LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
+LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
+LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
+LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
+### Rules for final target.
+
+LOCAL_LDFLAGS_Debug := \
+	-Wl,-z,now \
+	-Wl,-z,relro \
+	-Wl,--fatal-warnings \
+	-Wl,-z,noexecstack \
+	-fPIC \
+	-m64 \
+	-fuse-ld=gold \
+	-nostdlib \
+	-Wl,--no-undefined \
+	-Wl,--exclude-libs=ALL \
+	-Wl,--warn-shared-textrel \
+	-Wl,-O1 \
+	-Wl,--as-needed
+
+
+LOCAL_LDFLAGS_Release := \
+	-Wl,-z,now \
+	-Wl,-z,relro \
+	-Wl,--fatal-warnings \
+	-Wl,-z,noexecstack \
+	-fPIC \
+	-m64 \
+	-fuse-ld=gold \
+	-nostdlib \
+	-Wl,--no-undefined \
+	-Wl,--exclude-libs=ALL \
+	-Wl,-O1 \
+	-Wl,--as-needed \
+	-Wl,--gc-sections \
+	-Wl,--warn-shared-textrel
+
+
+LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
+
+LOCAL_STATIC_LIBRARIES :=
+
+# Enable grouping to fix circular references
+LOCAL_GROUP_STATIC_LIBRARIES := true
+
+LOCAL_SHARED_LIBRARIES := \
+	libstlport \
+	libdl
+
+# Add target alias to "gyp_all_modules" target.
+.PHONY: gyp_all_modules
+gyp_all_modules: third_party_libvpx_libvpx_intrinsics_sse4_1_gyp
+
+# Alias gyp target name.
+.PHONY: libvpx_intrinsics_sse4_1
+libvpx_intrinsics_sse4_1: third_party_libvpx_libvpx_intrinsics_sse4_1_gyp
+
+include $(BUILD_STATIC_LIBRARY)
diff --git a/libvpx_intrinsics_sse4_1.target.linux-x86.mk b/libvpx_intrinsics_sse4_1.target.linux-x86.mk
new file mode 100644
index 0000000..6eec602
--- /dev/null
+++ b/libvpx_intrinsics_sse4_1.target.linux-x86.mk
@@ -0,0 +1,289 @@
+# This file is generated by gyp; do not edit.
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE_CLASS := STATIC_LIBRARIES
+LOCAL_MODULE := third_party_libvpx_libvpx_intrinsics_sse4_1_gyp
+LOCAL_MODULE_SUFFIX := .a
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH)
+gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX))
+gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX))
+
+# Make sure our deps are built first.
+GYP_TARGET_DEPENDENCIES :=
+
+GYP_GENERATED_OUTPUTS :=
+
+# Make sure our deps and generated files are built first.
+LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
+
+LOCAL_GENERATED_SOURCES :=
+
+GYP_COPIED_SOURCE_ORIGIN_DIRS :=
+
+LOCAL_SRC_FILES := \
+	third_party/libvpx/source/libvpx/vp8/encoder/x86/quantize_sse4.c
+
+
+# Flags passed to both C and C++ files.
+MY_CFLAGS_Debug := \
+	--param=ssp-buffer-size=4 \
+	-fno-exceptions \
+	-fno-strict-aliasing \
+	-Wno-unused-parameter \
+	-Wno-missing-field-initializers \
+	-fvisibility=hidden \
+	-pipe \
+	-fPIC \
+	-Wno-unused-local-typedefs \
+	-msse4.1 \
+	-Wno-format \
+	-msse2 \
+	-mfpmath=sse \
+	-mmmx \
+	-m32 \
+	-ffunction-sections \
+	-funwind-tables \
+	-g \
+	-fno-short-enums \
+	-finline-limit=64 \
+	-Wa,--noexecstack \
+	-U_FORTIFY_SOURCE \
+	-Wno-extra \
+	-Wno-ignored-qualifiers \
+	-Wno-type-limits \
+	-Wno-unused-but-set-variable \
+	-fno-stack-protector \
+	-Wno-address \
+	-Wno-format-security \
+	-Wno-return-type \
+	-Wno-sequence-point \
+	-Os \
+	-g \
+	-fomit-frame-pointer \
+	-fdata-sections \
+	-ffunction-sections \
+	-funwind-tables
+
+MY_DEFS_Debug := \
+	'-DV8_DEPRECATION_WARNINGS' \
+	'-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \
+	'-D_FILE_OFFSET_BITS=64' \
+	'-DNO_TCMALLOC' \
+	'-DDISABLE_NACL' \
+	'-DCHROMIUM_BUILD' \
+	'-DUSE_LIBJPEG_TURBO=1' \
+	'-DENABLE_WEBRTC=1' \
+	'-DUSE_PROPRIETARY_CODECS' \
+	'-DENABLE_BROWSER_CDMS' \
+	'-DENABLE_CONFIGURATION_POLICY' \
+	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
+	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
+	'-DENABLE_EGLIMAGE=1' \
+	'-DCLD_VERSION=1' \
+	'-DCLD_DATA_FROM_STATIC' \
+	'-DENABLE_PRINTING=1' \
+	'-DENABLE_MANAGED_USERS=1' \
+	'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
+	'-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \
+	'-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \
+	'-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \
+	'-DDATA_REDUCTION_PROXY_WARMUP_URL="http://www.gstatic.com/generate_204"' \
+	'-DVIDEO_HOLE=1' \
+	'-DUSE_OPENSSL=1' \
+	'-DUSE_OPENSSL_CERTS=1' \
+	'-DANDROID' \
+	'-D__GNU_SOURCE=1' \
+	'-DUSE_STLPORT=1' \
+	'-D_STLP_USE_PTR_SPECIALIZATIONS=1' \
+	'-DCHROME_BUILD_ID=""' \
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
+	'-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \
+	'-D_DEBUG'
+
+
+# Include paths placed before CFLAGS/CPPFLAGS
+LOCAL_C_INCLUDES_Debug := \
+	$(gyp_shared_intermediate_dir) \
+	$(LOCAL_PATH)/third_party/libvpx/source/config/linux/ia32 \
+	$(LOCAL_PATH)/third_party/libvpx/source/libvpx \
+	$(PWD)/frameworks/wilhelm/include \
+	$(PWD)/bionic \
+	$(PWD)/external/stlport/stlport
+
+
+# Flags passed to only C++ (and not C) files.
+LOCAL_CPPFLAGS_Debug := \
+	-fno-rtti \
+	-fno-threadsafe-statics \
+	-fvisibility-inlines-hidden \
+	-Wno-deprecated \
+	-std=gnu++11 \
+	-Wno-narrowing \
+	-Wno-literal-suffix \
+	-Wno-non-virtual-dtor \
+	-Wno-sign-promo \
+	-Wno-non-virtual-dtor
+
+
+# Flags passed to both C and C++ files.
+MY_CFLAGS_Release := \
+	--param=ssp-buffer-size=4 \
+	-fno-exceptions \
+	-fno-strict-aliasing \
+	-Wno-unused-parameter \
+	-Wno-missing-field-initializers \
+	-fvisibility=hidden \
+	-pipe \
+	-fPIC \
+	-Wno-unused-local-typedefs \
+	-msse4.1 \
+	-Wno-format \
+	-msse2 \
+	-mfpmath=sse \
+	-mmmx \
+	-m32 \
+	-ffunction-sections \
+	-funwind-tables \
+	-g \
+	-fno-short-enums \
+	-finline-limit=64 \
+	-Wa,--noexecstack \
+	-U_FORTIFY_SOURCE \
+	-Wno-extra \
+	-Wno-ignored-qualifiers \
+	-Wno-type-limits \
+	-Wno-unused-but-set-variable \
+	-fno-stack-protector \
+	-Wno-address \
+	-Wno-format-security \
+	-Wno-return-type \
+	-Wno-sequence-point \
+	-Os \
+	-fno-ident \
+	-fdata-sections \
+	-ffunction-sections \
+	-fomit-frame-pointer \
+	-funwind-tables
+
+MY_DEFS_Release := \
+	'-DV8_DEPRECATION_WARNINGS' \
+	'-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \
+	'-D_FILE_OFFSET_BITS=64' \
+	'-DNO_TCMALLOC' \
+	'-DDISABLE_NACL' \
+	'-DCHROMIUM_BUILD' \
+	'-DUSE_LIBJPEG_TURBO=1' \
+	'-DENABLE_WEBRTC=1' \
+	'-DUSE_PROPRIETARY_CODECS' \
+	'-DENABLE_BROWSER_CDMS' \
+	'-DENABLE_CONFIGURATION_POLICY' \
+	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
+	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
+	'-DENABLE_EGLIMAGE=1' \
+	'-DCLD_VERSION=1' \
+	'-DCLD_DATA_FROM_STATIC' \
+	'-DENABLE_PRINTING=1' \
+	'-DENABLE_MANAGED_USERS=1' \
+	'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
+	'-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \
+	'-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \
+	'-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \
+	'-DDATA_REDUCTION_PROXY_WARMUP_URL="http://www.gstatic.com/generate_204"' \
+	'-DVIDEO_HOLE=1' \
+	'-DUSE_OPENSSL=1' \
+	'-DUSE_OPENSSL_CERTS=1' \
+	'-DANDROID' \
+	'-D__GNU_SOURCE=1' \
+	'-DUSE_STLPORT=1' \
+	'-D_STLP_USE_PTR_SPECIALIZATIONS=1' \
+	'-DCHROME_BUILD_ID=""' \
+	'-DNDEBUG' \
+	'-DNVALGRIND' \
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
+
+
+# Include paths placed before CFLAGS/CPPFLAGS
+LOCAL_C_INCLUDES_Release := \
+	$(gyp_shared_intermediate_dir) \
+	$(LOCAL_PATH)/third_party/libvpx/source/config/linux/ia32 \
+	$(LOCAL_PATH)/third_party/libvpx/source/libvpx \
+	$(PWD)/frameworks/wilhelm/include \
+	$(PWD)/bionic \
+	$(PWD)/external/stlport/stlport
+
+
+# Flags passed to only C++ (and not C) files.
+LOCAL_CPPFLAGS_Release := \
+	-fno-rtti \
+	-fno-threadsafe-statics \
+	-fvisibility-inlines-hidden \
+	-Wno-deprecated \
+	-std=gnu++11 \
+	-Wno-narrowing \
+	-Wno-literal-suffix \
+	-Wno-non-virtual-dtor \
+	-Wno-sign-promo \
+	-Wno-non-virtual-dtor
+
+
+LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
+LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
+LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
+LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
+### Rules for final target.
+
+LOCAL_LDFLAGS_Debug := \
+	-Wl,-z,now \
+	-Wl,-z,relro \
+	-Wl,--fatal-warnings \
+	-Wl,-z,noexecstack \
+	-fPIC \
+	-m32 \
+	-fuse-ld=gold \
+	-nostdlib \
+	-Wl,--no-undefined \
+	-Wl,--exclude-libs=ALL \
+	-Wl,--warn-shared-textrel \
+	-Wl,-O1 \
+	-Wl,--as-needed
+
+
+LOCAL_LDFLAGS_Release := \
+	-Wl,-z,now \
+	-Wl,-z,relro \
+	-Wl,--fatal-warnings \
+	-Wl,-z,noexecstack \
+	-fPIC \
+	-m32 \
+	-fuse-ld=gold \
+	-nostdlib \
+	-Wl,--no-undefined \
+	-Wl,--exclude-libs=ALL \
+	-Wl,-O1 \
+	-Wl,--as-needed \
+	-Wl,--gc-sections \
+	-Wl,--warn-shared-textrel
+
+
+LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
+
+LOCAL_STATIC_LIBRARIES :=
+
+# Enable grouping to fix circular references
+LOCAL_GROUP_STATIC_LIBRARIES := true
+
+LOCAL_SHARED_LIBRARIES := \
+	libstlport \
+	libdl
+
+# Add target alias to "gyp_all_modules" target.
+.PHONY: gyp_all_modules
+gyp_all_modules: third_party_libvpx_libvpx_intrinsics_sse4_1_gyp
+
+# Alias gyp target name.
+.PHONY: libvpx_intrinsics_sse4_1
+libvpx_intrinsics_sse4_1: third_party_libvpx_libvpx_intrinsics_sse4_1_gyp
+
+include $(BUILD_STATIC_LIBRARY)
diff --git a/libvpx_intrinsics_sse4_1.target.linux-x86_64.mk b/libvpx_intrinsics_sse4_1.target.linux-x86_64.mk
new file mode 100644
index 0000000..9f993c3
--- /dev/null
+++ b/libvpx_intrinsics_sse4_1.target.linux-x86_64.mk
@@ -0,0 +1,287 @@
+# This file is generated by gyp; do not edit.
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE_CLASS := STATIC_LIBRARIES
+LOCAL_MODULE := third_party_libvpx_libvpx_intrinsics_sse4_1_gyp
+LOCAL_MODULE_SUFFIX := .a
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH)
+gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX))
+gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX))
+
+# Make sure our deps are built first.
+GYP_TARGET_DEPENDENCIES :=
+
+GYP_GENERATED_OUTPUTS :=
+
+# Make sure our deps and generated files are built first.
+LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
+
+LOCAL_GENERATED_SOURCES :=
+
+GYP_COPIED_SOURCE_ORIGIN_DIRS :=
+
+LOCAL_SRC_FILES := \
+	third_party/libvpx/source/libvpx/vp8/encoder/x86/quantize_sse4.c
+
+
+# Flags passed to both C and C++ files.
+MY_CFLAGS_Debug := \
+	-fstack-protector \
+	--param=ssp-buffer-size=4 \
+	-fno-exceptions \
+	-fno-strict-aliasing \
+	-Wno-unused-parameter \
+	-Wno-missing-field-initializers \
+	-fvisibility=hidden \
+	-pipe \
+	-fPIC \
+	-Wno-unused-local-typedefs \
+	-msse4.1 \
+	-Wno-format \
+	-m64 \
+	-march=x86-64 \
+	-ffunction-sections \
+	-funwind-tables \
+	-g \
+	-fstack-protector \
+	-fno-short-enums \
+	-finline-limit=64 \
+	-Wa,--noexecstack \
+	-U_FORTIFY_SOURCE \
+	-Wno-extra \
+	-Wno-ignored-qualifiers \
+	-Wno-type-limits \
+	-Wno-unused-but-set-variable \
+	-Wno-address \
+	-Wno-format-security \
+	-Wno-return-type \
+	-Wno-sequence-point \
+	-Os \
+	-g \
+	-fomit-frame-pointer \
+	-fdata-sections \
+	-ffunction-sections \
+	-funwind-tables
+
+MY_DEFS_Debug := \
+	'-DV8_DEPRECATION_WARNINGS' \
+	'-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \
+	'-D_FILE_OFFSET_BITS=64' \
+	'-DNO_TCMALLOC' \
+	'-DDISABLE_NACL' \
+	'-DCHROMIUM_BUILD' \
+	'-DUSE_LIBJPEG_TURBO=1' \
+	'-DENABLE_WEBRTC=1' \
+	'-DUSE_PROPRIETARY_CODECS' \
+	'-DENABLE_BROWSER_CDMS' \
+	'-DENABLE_CONFIGURATION_POLICY' \
+	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
+	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
+	'-DENABLE_EGLIMAGE=1' \
+	'-DCLD_VERSION=1' \
+	'-DCLD_DATA_FROM_STATIC' \
+	'-DENABLE_PRINTING=1' \
+	'-DENABLE_MANAGED_USERS=1' \
+	'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
+	'-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \
+	'-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \
+	'-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \
+	'-DDATA_REDUCTION_PROXY_WARMUP_URL="http://www.gstatic.com/generate_204"' \
+	'-DVIDEO_HOLE=1' \
+	'-DUSE_OPENSSL=1' \
+	'-DUSE_OPENSSL_CERTS=1' \
+	'-DANDROID' \
+	'-D__GNU_SOURCE=1' \
+	'-DUSE_STLPORT=1' \
+	'-D_STLP_USE_PTR_SPECIALIZATIONS=1' \
+	'-DCHROME_BUILD_ID=""' \
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
+	'-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \
+	'-D_DEBUG'
+
+
+# Include paths placed before CFLAGS/CPPFLAGS
+LOCAL_C_INCLUDES_Debug := \
+	$(gyp_shared_intermediate_dir) \
+	$(LOCAL_PATH)/third_party/libvpx/source/config/linux/x64 \
+	$(LOCAL_PATH)/third_party/libvpx/source/libvpx \
+	$(PWD)/frameworks/wilhelm/include \
+	$(PWD)/bionic \
+	$(PWD)/external/stlport/stlport
+
+
+# Flags passed to only C++ (and not C) files.
+LOCAL_CPPFLAGS_Debug := \
+	-fno-rtti \
+	-fno-threadsafe-statics \
+	-fvisibility-inlines-hidden \
+	-Wno-deprecated \
+	-std=gnu++11 \
+	-Wno-narrowing \
+	-Wno-literal-suffix \
+	-Wno-non-virtual-dtor \
+	-Wno-sign-promo \
+	-Wno-non-virtual-dtor
+
+
+# Flags passed to both C and C++ files.
+MY_CFLAGS_Release := \
+	-fstack-protector \
+	--param=ssp-buffer-size=4 \
+	-fno-exceptions \
+	-fno-strict-aliasing \
+	-Wno-unused-parameter \
+	-Wno-missing-field-initializers \
+	-fvisibility=hidden \
+	-pipe \
+	-fPIC \
+	-Wno-unused-local-typedefs \
+	-msse4.1 \
+	-Wno-format \
+	-m64 \
+	-march=x86-64 \
+	-ffunction-sections \
+	-funwind-tables \
+	-g \
+	-fstack-protector \
+	-fno-short-enums \
+	-finline-limit=64 \
+	-Wa,--noexecstack \
+	-U_FORTIFY_SOURCE \
+	-Wno-extra \
+	-Wno-ignored-qualifiers \
+	-Wno-type-limits \
+	-Wno-unused-but-set-variable \
+	-Wno-address \
+	-Wno-format-security \
+	-Wno-return-type \
+	-Wno-sequence-point \
+	-Os \
+	-fno-ident \
+	-fdata-sections \
+	-ffunction-sections \
+	-fomit-frame-pointer \
+	-funwind-tables
+
+MY_DEFS_Release := \
+	'-DV8_DEPRECATION_WARNINGS' \
+	'-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \
+	'-D_FILE_OFFSET_BITS=64' \
+	'-DNO_TCMALLOC' \
+	'-DDISABLE_NACL' \
+	'-DCHROMIUM_BUILD' \
+	'-DUSE_LIBJPEG_TURBO=1' \
+	'-DENABLE_WEBRTC=1' \
+	'-DUSE_PROPRIETARY_CODECS' \
+	'-DENABLE_BROWSER_CDMS' \
+	'-DENABLE_CONFIGURATION_POLICY' \
+	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
+	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
+	'-DENABLE_EGLIMAGE=1' \
+	'-DCLD_VERSION=1' \
+	'-DCLD_DATA_FROM_STATIC' \
+	'-DENABLE_PRINTING=1' \
+	'-DENABLE_MANAGED_USERS=1' \
+	'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
+	'-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \
+	'-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \
+	'-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \
+	'-DDATA_REDUCTION_PROXY_WARMUP_URL="http://www.gstatic.com/generate_204"' \
+	'-DVIDEO_HOLE=1' \
+	'-DUSE_OPENSSL=1' \
+	'-DUSE_OPENSSL_CERTS=1' \
+	'-DANDROID' \
+	'-D__GNU_SOURCE=1' \
+	'-DUSE_STLPORT=1' \
+	'-D_STLP_USE_PTR_SPECIALIZATIONS=1' \
+	'-DCHROME_BUILD_ID=""' \
+	'-DNDEBUG' \
+	'-DNVALGRIND' \
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
+
+
+# Include paths placed before CFLAGS/CPPFLAGS
+LOCAL_C_INCLUDES_Release := \
+	$(gyp_shared_intermediate_dir) \
+	$(LOCAL_PATH)/third_party/libvpx/source/config/linux/x64 \
+	$(LOCAL_PATH)/third_party/libvpx/source/libvpx \
+	$(PWD)/frameworks/wilhelm/include \
+	$(PWD)/bionic \
+	$(PWD)/external/stlport/stlport
+
+
+# Flags passed to only C++ (and not C) files.
+LOCAL_CPPFLAGS_Release := \
+	-fno-rtti \
+	-fno-threadsafe-statics \
+	-fvisibility-inlines-hidden \
+	-Wno-deprecated \
+	-std=gnu++11 \
+	-Wno-narrowing \
+	-Wno-literal-suffix \
+	-Wno-non-virtual-dtor \
+	-Wno-sign-promo \
+	-Wno-non-virtual-dtor
+
+
+LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
+LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
+LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
+LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
+### Rules for final target.
+
+LOCAL_LDFLAGS_Debug := \
+	-Wl,-z,now \
+	-Wl,-z,relro \
+	-Wl,--fatal-warnings \
+	-Wl,-z,noexecstack \
+	-fPIC \
+	-m64 \
+	-fuse-ld=gold \
+	-nostdlib \
+	-Wl,--no-undefined \
+	-Wl,--exclude-libs=ALL \
+	-Wl,--warn-shared-textrel \
+	-Wl,-O1 \
+	-Wl,--as-needed
+
+
+LOCAL_LDFLAGS_Release := \
+	-Wl,-z,now \
+	-Wl,-z,relro \
+	-Wl,--fatal-warnings \
+	-Wl,-z,noexecstack \
+	-fPIC \
+	-m64 \
+	-fuse-ld=gold \
+	-nostdlib \
+	-Wl,--no-undefined \
+	-Wl,--exclude-libs=ALL \
+	-Wl,-O1 \
+	-Wl,--as-needed \
+	-Wl,--gc-sections \
+	-Wl,--warn-shared-textrel
+
+
+LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
+
+LOCAL_STATIC_LIBRARIES :=
+
+# Enable grouping to fix circular references
+LOCAL_GROUP_STATIC_LIBRARIES := true
+
+LOCAL_SHARED_LIBRARIES := \
+	libstlport \
+	libdl
+
+# Add target alias to "gyp_all_modules" target.
+.PHONY: gyp_all_modules
+gyp_all_modules: third_party_libvpx_libvpx_intrinsics_sse4_1_gyp
+
+# Alias gyp target name.
+.PHONY: libvpx_intrinsics_sse4_1
+libvpx_intrinsics_sse4_1: third_party_libvpx_libvpx_intrinsics_sse4_1_gyp
+
+include $(BUILD_STATIC_LIBRARY)
diff --git a/libvpx_intrinsics_ssse3.target.darwin-x86.mk b/libvpx_intrinsics_ssse3.target.darwin-x86.mk
index ed99d02..40b0c1b 100644
--- a/libvpx_intrinsics_ssse3.target.darwin-x86.mk
+++ b/libvpx_intrinsics_ssse3.target.darwin-x86.mk
@@ -25,6 +25,7 @@ GYP_COPIED_SOURCE_ORIGIN_DIRS :=
 LOCAL_SRC_FILES := \
 	third_party/libvpx/source/libvpx/vp8/common/x86/variance_ssse3.c \
 	third_party/libvpx/source/libvpx/vp8/encoder/x86/quantize_ssse3.c \
+	third_party/libvpx/source/libvpx/vp9/common/x86/vp9_idct_intrin_ssse3.c \
 	third_party/libvpx/source/libvpx/vp9/common/x86/vp9_subpixel_8t_intrin_ssse3.c
 
 
@@ -84,6 +85,7 @@ MY_DEFS_Debug := \
 	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DCLD_DATA_FROM_STATIC' \
 	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
@@ -120,6 +122,9 @@ LOCAL_CPPFLAGS_Debug := \
 	-fno-threadsafe-statics \
 	-fvisibility-inlines-hidden \
 	-Wno-deprecated \
+	-std=gnu++11 \
+	-Wno-narrowing \
+	-Wno-literal-suffix \
 	-Wno-non-virtual-dtor \
 	-Wno-sign-promo \
 	-Wno-non-virtual-dtor
@@ -181,6 +186,7 @@ MY_DEFS_Release := \
 	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DCLD_DATA_FROM_STATIC' \
 	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
@@ -217,6 +223,9 @@ LOCAL_CPPFLAGS_Release := \
 	-fno-threadsafe-statics \
 	-fvisibility-inlines-hidden \
 	-Wno-deprecated \
+	-std=gnu++11 \
+	-Wno-narrowing \
+	-Wno-literal-suffix \
 	-Wno-non-virtual-dtor \
 	-Wno-sign-promo \
 	-Wno-non-virtual-dtor
diff --git a/libvpx_intrinsics_ssse3.target.darwin-x86_64.mk b/libvpx_intrinsics_ssse3.target.darwin-x86_64.mk
index 5a5e697..c99cbb6 100644
--- a/libvpx_intrinsics_ssse3.target.darwin-x86_64.mk
+++ b/libvpx_intrinsics_ssse3.target.darwin-x86_64.mk
@@ -25,6 +25,7 @@ GYP_COPIED_SOURCE_ORIGIN_DIRS :=
 LOCAL_SRC_FILES := \
 	third_party/libvpx/source/libvpx/vp8/common/x86/variance_ssse3.c \
 	third_party/libvpx/source/libvpx/vp8/encoder/x86/quantize_ssse3.c \
+	third_party/libvpx/source/libvpx/vp9/common/x86/vp9_idct_intrin_ssse3.c \
 	third_party/libvpx/source/libvpx/vp9/common/x86/vp9_subpixel_8t_intrin_ssse3.c
 
 
@@ -83,6 +84,7 @@ MY_DEFS_Debug := \
 	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DCLD_DATA_FROM_STATIC' \
 	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
@@ -119,6 +121,9 @@ LOCAL_CPPFLAGS_Debug := \
 	-fno-threadsafe-statics \
 	-fvisibility-inlines-hidden \
 	-Wno-deprecated \
+	-std=gnu++11 \
+	-Wno-narrowing \
+	-Wno-literal-suffix \
 	-Wno-non-virtual-dtor \
 	-Wno-sign-promo \
 	-Wno-non-virtual-dtor
@@ -179,6 +184,7 @@ MY_DEFS_Release := \
 	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DCLD_DATA_FROM_STATIC' \
 	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
@@ -215,6 +221,9 @@ LOCAL_CPPFLAGS_Release := \
 	-fno-threadsafe-statics \
 	-fvisibility-inlines-hidden \
 	-Wno-deprecated \
+	-std=gnu++11 \
+	-Wno-narrowing \
+	-Wno-literal-suffix \
 	-Wno-non-virtual-dtor \
 	-Wno-sign-promo \
 	-Wno-non-virtual-dtor
diff --git a/libvpx_intrinsics_ssse3.target.linux-x86.mk b/libvpx_intrinsics_ssse3.target.linux-x86.mk
index ed99d02..40b0c1b 100644
--- a/libvpx_intrinsics_ssse3.target.linux-x86.mk
+++ b/libvpx_intrinsics_ssse3.target.linux-x86.mk
@@ -25,6 +25,7 @@ GYP_COPIED_SOURCE_ORIGIN_DIRS :=
 LOCAL_SRC_FILES := \
 	third_party/libvpx/source/libvpx/vp8/common/x86/variance_ssse3.c \
 	third_party/libvpx/source/libvpx/vp8/encoder/x86/quantize_ssse3.c \
+	third_party/libvpx/source/libvpx/vp9/common/x86/vp9_idct_intrin_ssse3.c \
 	third_party/libvpx/source/libvpx/vp9/common/x86/vp9_subpixel_8t_intrin_ssse3.c
 
 
@@ -84,6 +85,7 @@ MY_DEFS_Debug := \
 	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DCLD_DATA_FROM_STATIC' \
 	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
@@ -120,6 +122,9 @@ LOCAL_CPPFLAGS_Debug := \
 	-fno-threadsafe-statics \
 	-fvisibility-inlines-hidden \
 	-Wno-deprecated \
+	-std=gnu++11 \
+	-Wno-narrowing \
+	-Wno-literal-suffix \
 	-Wno-non-virtual-dtor \
 	-Wno-sign-promo \
 	-Wno-non-virtual-dtor
@@ -181,6 +186,7 @@ MY_DEFS_Release := \
 	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DCLD_DATA_FROM_STATIC' \
 	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
@@ -217,6 +223,9 @@ LOCAL_CPPFLAGS_Release := \
 	-fno-threadsafe-statics \
 	-fvisibility-inlines-hidden \
 	-Wno-deprecated \
+	-std=gnu++11 \
+	-Wno-narrowing \
+	-Wno-literal-suffix \
 	-Wno-non-virtual-dtor \
 	-Wno-sign-promo \
 	-Wno-non-virtual-dtor
diff --git a/libvpx_intrinsics_ssse3.target.linux-x86_64.mk b/libvpx_intrinsics_ssse3.target.linux-x86_64.mk
index 5a5e697..c99cbb6 100644
--- a/libvpx_intrinsics_ssse3.target.linux-x86_64.mk
+++ b/libvpx_intrinsics_ssse3.target.linux-x86_64.mk
@@ -25,6 +25,7 @@ GYP_COPIED_SOURCE_ORIGIN_DIRS :=
 LOCAL_SRC_FILES := \
 	third_party/libvpx/source/libvpx/vp8/common/x86/variance_ssse3.c \
 	third_party/libvpx/source/libvpx/vp8/encoder/x86/quantize_ssse3.c \
+	third_party/libvpx/source/libvpx/vp9/common/x86/vp9_idct_intrin_ssse3.c \
 	third_party/libvpx/source/libvpx/vp9/common/x86/vp9_subpixel_8t_intrin_ssse3.c
 
 
@@ -83,6 +84,7 @@ MY_DEFS_Debug := \
 	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DCLD_DATA_FROM_STATIC' \
 	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
@@ -119,6 +121,9 @@ LOCAL_CPPFLAGS_Debug := \
 	-fno-threadsafe-statics \
 	-fvisibility-inlines-hidden \
 	-Wno-deprecated \
+	-std=gnu++11 \
+	-Wno-narrowing \
+	-Wno-literal-suffix \
 	-Wno-non-virtual-dtor \
 	-Wno-sign-promo \
 	-Wno-non-virtual-dtor
@@ -179,6 +184,7 @@ MY_DEFS_Release := \
 	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DCLD_DATA_FROM_STATIC' \
 	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
@@ -215,6 +221,9 @@ LOCAL_CPPFLAGS_Release := \
 	-fno-threadsafe-statics \
 	-fvisibility-inlines-hidden \
 	-Wno-deprecated \
+	-std=gnu++11 \
+	-Wno-narrowing \
+	-Wno-literal-suffix \
 	-Wno-non-virtual-dtor \
 	-Wno-sign-promo \
 	-Wno-non-virtual-dtor
diff --git a/libvpx_obj_int_extract.host.darwin-arm.mk b/libvpx_obj_int_extract.host.darwin-arm.mk
index ab2ed88..eb38c2f 100644
--- a/libvpx_obj_int_extract.host.darwin-arm.mk
+++ b/libvpx_obj_int_extract.host.darwin-arm.mk
@@ -64,6 +64,7 @@ MY_DEFS_Debug := \
 	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DCLD_DATA_FROM_STATIC' \
 	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
@@ -133,6 +134,7 @@ MY_DEFS_Release := \
 	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DCLD_DATA_FROM_STATIC' \
 	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
diff --git a/libvpx_obj_int_extract.host.darwin-arm64.mk b/libvpx_obj_int_extract.host.darwin-arm64.mk
index f079a42..23d94a5 100644
--- a/libvpx_obj_int_extract.host.darwin-arm64.mk
+++ b/libvpx_obj_int_extract.host.darwin-arm64.mk
@@ -64,6 +64,7 @@ MY_DEFS_Debug := \
 	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DCLD_DATA_FROM_STATIC' \
 	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
@@ -133,6 +134,7 @@ MY_DEFS_Release := \
 	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DCLD_DATA_FROM_STATIC' \
 	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
diff --git a/libvpx_obj_int_extract.host.darwin-x86.mk b/libvpx_obj_int_extract.host.darwin-x86.mk
index 3e8a0ac..0992973 100644
--- a/libvpx_obj_int_extract.host.darwin-x86.mk
+++ b/libvpx_obj_int_extract.host.darwin-x86.mk
@@ -64,6 +64,7 @@ MY_DEFS_Debug := \
 	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DCLD_DATA_FROM_STATIC' \
 	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
@@ -133,6 +134,7 @@ MY_DEFS_Release := \
 	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DCLD_DATA_FROM_STATIC' \
 	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
diff --git a/libvpx_obj_int_extract.host.darwin-x86_64.mk b/libvpx_obj_int_extract.host.darwin-x86_64.mk
index d0fff1c..2588de7 100644
--- a/libvpx_obj_int_extract.host.darwin-x86_64.mk
+++ b/libvpx_obj_int_extract.host.darwin-x86_64.mk
@@ -64,6 +64,7 @@ MY_DEFS_Debug := \
 	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DCLD_DATA_FROM_STATIC' \
 	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
@@ -133,6 +134,7 @@ MY_DEFS_Release := \
 	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DCLD_DATA_FROM_STATIC' \
 	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
diff --git a/libvpx_obj_int_extract.host.linux-arm.mk b/libvpx_obj_int_extract.host.linux-arm.mk
index 0933c0e..c704be7 100644
--- a/libvpx_obj_int_extract.host.linux-arm.mk
+++ b/libvpx_obj_int_extract.host.linux-arm.mk
@@ -65,6 +65,7 @@ MY_DEFS_Debug := \
 	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DCLD_DATA_FROM_STATIC' \
 	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
@@ -135,6 +136,7 @@ MY_DEFS_Release := \
 	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DCLD_DATA_FROM_STATIC' \
 	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
diff --git a/libvpx_obj_int_extract.host.linux-arm64.mk b/libvpx_obj_int_extract.host.linux-arm64.mk
index 97c5099..e38b160 100644
--- a/libvpx_obj_int_extract.host.linux-arm64.mk
+++ b/libvpx_obj_int_extract.host.linux-arm64.mk
@@ -65,6 +65,7 @@ MY_DEFS_Debug := \
 	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DCLD_DATA_FROM_STATIC' \
 	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
@@ -135,6 +136,7 @@ MY_DEFS_Release := \
 	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DCLD_DATA_FROM_STATIC' \
 	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
diff --git a/libvpx_obj_int_extract.host.linux-x86.mk b/libvpx_obj_int_extract.host.linux-x86.mk
index e8608fd..5a5789c 100644
--- a/libvpx_obj_int_extract.host.linux-x86.mk
+++ b/libvpx_obj_int_extract.host.linux-x86.mk
@@ -65,6 +65,7 @@ MY_DEFS_Debug := \
 	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DCLD_DATA_FROM_STATIC' \
 	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
@@ -135,6 +136,7 @@ MY_DEFS_Release := \
 	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DCLD_DATA_FROM_STATIC' \
 	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
diff --git a/libvpx_obj_int_extract.host.linux-x86_64.mk b/libvpx_obj_int_extract.host.linux-x86_64.mk
index 992762a..23add11 100644
--- a/libvpx_obj_int_extract.host.linux-x86_64.mk
+++ b/libvpx_obj_int_extract.host.linux-x86_64.mk
@@ -65,6 +65,7 @@ MY_DEFS_Debug := \
 	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DCLD_DATA_FROM_STATIC' \
 	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
@@ -135,6 +136,7 @@ MY_DEFS_Release := \
 	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DCLD_VERSION=1' \
+	'-DCLD_DATA_FROM_STATIC' \
 	'-DENABLE_PRINTING=1' \
 	'-DENABLE_MANAGED_USERS=1' \
 	'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
author	Android Chromium Automerger <chromium-automerger@android>	2014-06-25 15:10:09 +0000
committer	Android Chromium Automerger <chromium-automerger@android>	2014-06-25 15:10:09 +0000
commit	f15f350f41d56d2317c4c8e0ddbe1126ea3a0daa (patch)
tree	c0a60d29a45f817f3f71256abebf3f0b539b1363
parent	bd92bdeebd4ce09cde7d95a26a58aa7f0bcff570 (diff)
download	libvpx-f15f350f41d56d2317c4c8e0ddbe1126ea3a0daa.tar.gz