Skip to content

Commit

Permalink
Add Support of Android NDK 10 (July 2014)
Browse files Browse the repository at this point in the history
Add optional feature : Progress bar when extracting of Boost archive
  • Loading branch information
jynolen committed Jul 18, 2014
1 parent 8075d96 commit 859b845
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 2 deletions.
11 changes: 10 additions & 1 deletion build-android.sh
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,11 @@ case "$NDK_RN" in
CXXPATH=$AndroidNDKRoot/toolchains/${TOOLCHAIN}/prebuilt/${PlatformOS}-x86_64/bin/arm-linux-androideabi-g++
TOOLSET=gcc-androidR8e
;;
"10 (64-bit)")
TOOLCHAIN=${TOOLCHAIN:-arm-linux-androideabi-4.6}
CXXPATH=$AndroidNDKRoot/toolchains/${TOOLCHAIN}/prebuilt/${PlatformOS}-x86_64/bin/arm-linux-androideabi-g++
TOOLSET=gcc-androidR8e
;;
*)
echo "Undefined or not supported Android NDK version!"
exit 1
Expand Down Expand Up @@ -288,7 +293,11 @@ fi
if [ ! -d $PROGDIR/$BOOST_DIR ]
then
echo "Unpacking boost"
tar xjf $PROGDIR/$BOOST_TAR
if [ $OPTION_PROGRESS = "yes" ] ; then
pv $PROGDIR/$BOOST_TAR | tar xjf - -C $PROGDIR
else
tar xjf $PROGDIR/$BOOST_TAR
fi
fi

if [ $DOWNLOAD = yes ] ; then
Expand Down
7 changes: 6 additions & 1 deletion build-common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -660,7 +660,12 @@ do_option_verbose ()
OPTION_OUTPUT=
do_logpath () { OPTION_OUTPUT=$1; }

do_progress_bar()
{
OPTION_PROGRESS="yes"
}

register_option "--help" do_option_help "Print this help."
register_option "--verbose" do_option_verbose "Enable verbose mode."
register_option "--output=<path>" do_logpath "Specify specific log output path (only terminal output by default)"

register_option "--progress" do_progress_bar "Enable extraction progress bar"

0 comments on commit 859b845

Please sign in to comment.