Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(647)

Unified Diff: generate_gypi.sh

Issue 148913004: libvpx: Pull from upstream (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/libvpx/
Patch Set: Created 6 years, 11 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
Download patch
« no previous file with comments | « README.chromium ('k') | libvpx_srcs_arm.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: generate_gypi.sh
===================================================================
--- generate_gypi.sh (revision 247490)
+++ generate_gypi.sh (working copy)
@@ -257,6 +257,7 @@
--arch=$2 \
--sym=vp8_rtcd \
--config=$BASE_DIR/$TEMP_DIR/libvpx.config \
+ --disable-avx2 \
$BASE_DIR/$LIBVPX_SRC_DIR/vp8/common/rtcd_defs.sh \
> $BASE_DIR/$LIBVPX_CONFIG_DIR/$1/vp8_rtcd.h
@@ -264,6 +265,7 @@
--arch=$2 \
--sym=vp9_rtcd \
--config=$BASE_DIR/$TEMP_DIR/libvpx.config \
+ --disable-avx2 \
$BASE_DIR/$LIBVPX_SRC_DIR/vp9/common/vp9_rtcd_defs.sh \
> $BASE_DIR/$LIBVPX_CONFIG_DIR/$1/vp9_rtcd.h
@@ -271,6 +273,7 @@
--arch=$2 \
--sym=vpx_scale_rtcd \
--config=$BASE_DIR/$TEMP_DIR/libvpx.config \
+ --disable-avx2 \
$BASE_DIR/$LIBVPX_SRC_DIR/vpx_scale/vpx_scale_rtcd.sh \
> $BASE_DIR/$LIBVPX_CONFIG_DIR/$1/vpx_scale_rtcd.h
@@ -305,7 +308,7 @@
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-vp9-encoder --disable-unit-tests --disable-install-docs --disable-examples"
+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 --disable-avx2"
gen_config_files linux/ia32 "--target=x86-linux-gcc --disable-ccache --enable-pic --enable-realtime-only ${all_platforms}"
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 ${all_platforms}"
« no previous file with comments | « README.chromium ('k') | libvpx_srcs_arm.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698