third_party/libvpx/generate_gni.sh - Issue 2322363002: Rationalize libvpx configurations

Unified Diff: third_party/libvpx/generate_gni.sh

Issue 2322363002: Rationalize libvpx configurations (Closed)

Patch Set: Created 4 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Index: third_party/libvpx/generate_gni.sh

diff --git a/third_party/libvpx/generate_gni.sh b/third_party/libvpx/generate_gni.sh

index 142cad35b4307e58c517e4235393bf43540eff34..13e8b66ed7f3a91946caac234fc54c110ca0c5dc 100755

--- a/third_party/libvpx/generate_gni.sh

+++ b/third_party/libvpx/generate_gni.sh

@@ -312,22 +312,24 @@ 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 lin

Johann 2016/09/09 19:59:15 I was wondering about that. I didn't see it in thi

+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

« no previous file with comments | « no previous file | third_party/libvpx/libvpx_srcs.gni » ('j') | no next file with comments »