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

Unified Diff: source/libvpx/build/make/iosbuild.sh

Issue 592203002: libvpx: Pull from upstream (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/libvpx/
Patch Set: Created 6 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
Download patch
« no previous file with comments | « source/config/win/x64/vpx_scale_rtcd.h ('k') | source/libvpx/build/make/rtcd.pl » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: source/libvpx/build/make/iosbuild.sh
===================================================================
--- source/libvpx/build/make/iosbuild.sh (revision 292072)
+++ source/libvpx/build/make/iosbuild.sh (working copy)
@@ -43,7 +43,7 @@
mkdir "${target}"
cd "${target}"
eval "../../${LIBVPX_SOURCE_DIR}/configure" --target="${target}" \
- --disable-docs ${devnull}
+ --disable-docs ${EXTRA_CONFIGURE_ARGS} ${devnull}
export DIST_DIR
eval make -j ${MAKE_JOBS} dist ${devnull}
cd "${old_pwd}"
@@ -62,7 +62,7 @@
echo "__ARM_ARCH_6__"
;;
armv7-*)
- echo "__ARM_ARCH_7__"
+ echo "__ARM_ARCH_7A__"
;;
armv7s-*)
echo "__ARM_ARCH_7S__"
@@ -206,6 +206,10 @@
# Parse the command line.
while [ -n "$1" ]; do
case "$1" in
+ --extra-configure-args)
+ EXTRA_CONFIGURE_ARGS="$2"
+ shift
+ ;;
--help)
iosbuild_usage
exit
@@ -235,6 +239,7 @@
cat << EOF
BUILD_ROOT=${BUILD_ROOT}
DIST_DIR=${DIST_DIR}
+ EXTRA_CONFIGURE_ARGS=${EXTRA_CONFIGURE_ARGS}
FRAMEWORK_DIR=${FRAMEWORK_DIR}
HEADER_DIR=${HEADER_DIR}
MAKE_JOBS=${MAKE_JOBS}
« no previous file with comments | « source/config/win/x64/vpx_scale_rtcd.h ('k') | source/libvpx/build/make/rtcd.pl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698