| Index: third_party/libvpx/generate_gypi.sh | 
| diff --git a/third_party/libvpx/generate_gypi.sh b/third_party/libvpx/generate_gypi.sh | 
| index 350c05ea6b28b03302d490f6b87986ad4ea97c95..bf7f8a89cf0d1eb68b98b8950d4188241be6a1b1 100755 | 
| --- a/third_party/libvpx/generate_gypi.sh | 
| +++ b/third_party/libvpx/generate_gypi.sh | 
| @@ -465,8 +465,10 @@ gen_config_files linux/ia32 "--target=x86-linux-gcc --disable-ccache --enable-pi | 
| gen_config_files linux/x64 "--target=x86_64-linux-gcc --disable-ccache --enable-pic --enable-realtime-only ${all_platforms}" | 
| gen_config_files linux/arm "--target=armv6-linux-gcc --enable-pic --enable-realtime-only --disable-install-bins --disable-install-libs --disable-edsp ${all_platforms}" | 
| gen_config_files linux/arm-neon "--target=armv7-linux-gcc --enable-pic --enable-realtime-only --disable-edsp ${all_platforms}" | 
| +gen_config_files linux/arm-neon-no-vp9 "--target=armv7-linux-gcc --disable-vp9 --enable-pic --enable-realtime-only --disable-edsp ${all_platforms}" | 
| gen_config_files linux/arm-neon-cpu-detect "--target=armv7-linux-gcc --enable-pic --enable-realtime-only --enable-runtime-cpu-detect --disable-edsp ${all_platforms}" | 
| gen_config_files linux/arm64 "--force-target=armv8-linux-gcc --enable-pic --enable-realtime-only --disable-edsp ${all_platforms}" | 
| +gen_config_files linux/arm64-no-vp9 "--force-target=armv8-linux-gcc --disable-vp9 --enable-pic --enable-realtime-only --disable-edsp ${all_platforms}" | 
| gen_config_files linux/mipsel "--target=mips32-linux-gcc ${all_platforms}" | 
| gen_config_files linux/mips64el "--target=mips64-linux-gcc ${all_platforms}" | 
| gen_config_files linux/generic "--target=generic-gnu --enable-pic --enable-realtime-only ${all_platforms}" | 
| @@ -485,8 +487,10 @@ lint_config linux/ia32 | 
| lint_config linux/x64 | 
| lint_config linux/arm | 
| lint_config linux/arm-neon | 
| +lint_config linux/arm-neon-no-vp9 | 
| lint_config linux/arm-neon-cpu-detect | 
| lint_config linux/arm64 | 
| +lint_config linux/arm64-no-vp9 | 
| lint_config linux/mipsel | 
| lint_config linux/mips64el | 
| lint_config linux/generic | 
| @@ -506,8 +510,10 @@ gen_rtcd_header linux/ia32 x86 | 
| gen_rtcd_header linux/x64 x86_64 | 
| gen_rtcd_header linux/arm armv6 | 
| gen_rtcd_header linux/arm-neon armv7 | 
| +gen_rtcd_header linux/arm-neon-no-vp9 armv7 | 
| gen_rtcd_header linux/arm-neon-cpu-detect armv7 | 
| gen_rtcd_header linux/arm64 armv8 | 
| +gen_rtcd_header linux/arm64-no-vp9 armv8 | 
| gen_rtcd_header linux/mipsel mipsel | 
| gen_rtcd_header linux/mips64el mips64el | 
| gen_rtcd_header linux/generic generic | 
| @@ -553,6 +559,12 @@ if [ -z $ONLY_CONFIGS ]; then | 
| make libvpx_srcs.txt target=libs $config > /dev/null | 
| convert_srcs_to_project_files libvpx_srcs.txt libvpx_srcs_arm_neon | 
|  | 
| +  echo "Generate ARM NEON source list (VP9 disabled)." | 
| +  config=$(print_config linux/arm-neon-no-vp9) | 
| +  make_clean | 
| +  make libvpx_srcs.txt target=libs $config > /dev/null | 
| +  convert_srcs_to_project_files libvpx_srcs.txt libvpx_srcs_arm_neon_no_vp9 | 
| + | 
| echo "Generate ARM NEON CPU DETECT source list." | 
| config=$(print_config linux/arm-neon-cpu-detect) | 
| make_clean | 
| @@ -565,6 +577,12 @@ if [ -z $ONLY_CONFIGS ]; then | 
| make libvpx_srcs.txt target=libs $config > /dev/null | 
| convert_srcs_to_project_files libvpx_srcs.txt libvpx_srcs_arm64 | 
|  | 
| +  echo "Generate ARM64 source list (VP9 disabled)." | 
| +  config=$(print_config linux/arm64-no-vp9) | 
| +  make_clean | 
| +  make libvpx_srcs.txt target=libs $config > /dev/null | 
| +  convert_srcs_to_project_files libvpx_srcs.txt libvpx_srcs_arm64_no_vp9 | 
| + | 
| echo "Generate MIPS source list." | 
| config=$(print_config_basic linux/mipsel) | 
| make_clean | 
|  |