Rationalize libvpx configurations

third_party/libvpx/generate_gni.sh

 #!/bin/bash -e
 #
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # This script is used to generate .gni files and files in the
 # config/platform directories needed to build libvpx.
 # Every time libvpx source code is updated just run this script.
 #
@@ skipping 294 matching lines @@
 
 find_duplicates
 
 echo "Create temporary directory."
 TEMP_DIR="$LIBVPX_SRC_DIR.temp"
 rm -rf $TEMP_DIR
 cp -R $LIBVPX_SRC_DIR $TEMP_DIR
 cd $TEMP_DIR
 
 echo "Generate config files."
-all_platforms="--enable-external-build --enable-postproc --disable-install-srcs --enable-multi-res-encoding --enable-temporal-denoising --disable-unit-tests --disable-install-docs --disable-examples --enable-vp9-temporal-denoising --enable-vp9-postproc --size-limit=16384x16384"
-x86_platforms="$DISABLE_AVX --as=yasm $HIGHBD"
-gen_config_files linux/ia32 "--target=x86-linux-gcc --disable-ccache --enable-pic --enable-realtime-only ${all_platforms} ${x86_platforms}"
-gen_config_files linux/x64 "--target=x86_64-linux-gcc --disable-ccache --enable-pic --enable-realtime-only ${all_platforms} ${x86_platforms}"
-gen_config_files linux/arm "--target=armv7-linux-gcc --enable-pic --enable-realtime-only --disable-install-bins --disable-install-libs --disable-neon ${all_platforms}"
-gen_config_files linux/arm-neon "--target=armv7-linux-gcc --enable-pic --enable-realtime-only ${all_platforms}"
-gen_config_files linux/arm-neon-cpu-detect "--target=armv7-linux-gcc --enable-pic --enable-realtime-only --enable-runtime-cpu-detect ${all_platforms}"
-gen_config_files linux/arm64 "--force-target=armv8-linux-gcc --enable-pic --enable-realtime-only ${all_platforms}"
+all_platforms="--enable-external-build --enable-postproc --enable-multi-res-encoding --enable-temporal-denoising"

[jzern, 2016/09/09 19:20:20]

you're in bash so you can use += and split the lines a bit more if you wanted

[Johann, 2016/09/09 19:59:15]

I was wondering about that. I didn't see it in this file yet, so I was avoiding
it.

+all_platforms="${all_platforms} --enable-vp9-temporal-denoising --enable-vp9-postproc --size-limit=16384x16384"
+all_platforms="${all_platforms} --enable-realtime-only"
+x86_platforms="--enable-pic --as=yasm $DISABLE_AVX $HIGHBD"
+gen_config_files linux/ia32 "--target=x86-linux-gcc ${all_platforms} ${x86_platforms}"
+gen_config_files linux/x64 "--target=x86_64-linux-gcc ${all_platforms} ${x86_platforms}"
+gen_config_files linux/arm "--target=armv7-linux-gcc --disable-neon ${all_platforms}"
+gen_config_files linux/arm-neon "--target=armv7-linux-gcc ${all_platforms}"
+gen_config_files linux/arm-neon-cpu-detect "--target=armv7-linux-gcc --enable-runtime-cpu-detect ${all_platforms}"
+gen_config_files linux/arm64 "--target=armv8-linux-gcc ${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}"
-gen_config_files win/ia32 "--target=x86-win32-vs12 --enable-realtime-only ${all_platforms} ${x86_platforms}"
-gen_config_files win/x64 "--target=x86_64-win64-vs12 --enable-realtime-only ${all_platforms} ${x86_platforms}"
-gen_config_files mac/ia32 "--target=x86-darwin9-gcc --enable-pic --enable-realtime-only ${all_platforms} ${x86_platforms}"
-gen_config_files mac/x64 "--target=x86_64-darwin9-gcc --enable-pic --enable-realtime-only ${all_platforms} ${x86_platforms}"
-gen_config_files nacl "--target=generic-gnu --enable-pic --enable-realtime-only ${all_platforms}"
+gen_config_files linux/generic "--target=generic-gnu ${all_platforms}"
+gen_config_files win/ia32 "--target=x86-win32-vs12 ${all_platforms} ${x86_platforms}"
+gen_config_files win/x64 "--target=x86_64-win64-vs12 ${all_platforms} ${x86_platforms}"
+gen_config_files mac/ia32 "--target=x86-darwin9-gcc ${all_platforms} ${x86_platforms}"
+gen_config_files mac/x64 "--target=x86_64-darwin9-gcc ${all_platforms} ${x86_platforms}"
+gen_config_files nacl "--target=generic-gnu ${all_platforms}"
 
 echo "Remove temporary directory."
 cd $BASE_DIR
 rm -rf $TEMP_DIR
 
 echo "Lint libvpx configuration."
 lint_config linux/ia32
 lint_config linux/x64
 lint_config linux/arm
 lint_config linux/arm-neon
@@ skipping 104 matching lines @@
 
 gn format --in-place $BASE_DIR/BUILD.gn
 gn format --in-place $BASE_DIR/libvpx_srcs.gni
 
 cd $BASE_DIR/$LIBVPX_SRC_DIR
 update_readme
 
 cd $BASE_DIR
 
 # TODO(fgalligan): Can we turn on "--enable-realtime-only" for mipsel?