Merge lp:~pfalcon/linaro-android-build-tools/make-params into lp:linaro-android-build-tools

[Paul Sokolovsky]

Add MAKE_TARGETS and MAKE_JOBS .

[James Westby (james-w)]

Looks good to me.

Was EABI unused?

Thanks,

James

review: Approve

[Paul Sokolovsky (pfalcon)]

On Fri, 29 Apr 2011 14:35:47 -0000
James Westby <email address hidden> wrote:

> Review: Approve
> Looks good to me.
>
> Was EABI unused?

EABI is set to default in helper/repo-sync-from-mirror (i.e. for all
build scripts), so I just removed duplicate set for it in toolchain
build script.

Thanks!

=== modified file 'build-scripts/build-android'
--- build-scripts/build-android	2011-04-08 16:16:50 +0000
+++ build-scripts/build-android	2011-04-29 14:25:49 +0000
@@ -22,8 +22,8 @@
 export JAVA_HOME=/usr/lib/jvm/java-6-sun-1.6.0.22/
 export ANDROID_JAVA_HOME=$JAVA_HOME
 
-cpuc=`cat /proc/cpuinfo  | grep processor | wc -l`
-threads=$(($cpuc * 4))
+MAKE_TARGETS="${MAKE_TARGETS-boottarball systemtarball userdatatarball}"
+calc_make_jobs
 
 if test -n "$TOOLCHAIN_URL"; then
 	wget $TOOLCHAIN_URL
@@ -43,4 +43,4 @@
     SHOWCOMMANDS=showcommands
 fi
 
-time -p make -j${threads} boottarball systemtarball userdatatarball ${SHOWCOMMANDS} HOST_CC=gcc-4.5 HOST_CXX=g++-4.5 HOST_CPP=cpp-4.5
+time -p make -j$MAKE_JOBS $MAKE_TARGETS $SHOWCOMMANDS HOST_CC=gcc-4.5 HOST_CXX=g++-4.5 HOST_CPP=cpp-4.5

=== modified file 'build-scripts/build-android-toolchain'
--- build-scripts/build-android-toolchain	2011-04-27 22:22:12 +0000
+++ build-scripts/build-android-toolchain	2011-04-29 14:25:49 +0000
@@ -9,16 +9,13 @@
 source "${BUILD_SCRIPT_ROOT}"/helpers
 
 # BINUTILS_URL - set this in env to override default binutils version shipped by a version downloaded from ftp
-BINUTILS_VERSION=2.20.1
+BINUTILS_VERSION=${BINUTILS_VERSION-2.20.1}
 # GCC_URL - set this in env to override default gcc version shipped by a version downloaded from ftp
-GCC_VERSION=4.4.0
-
-EABI="${EABI-arm-eabi}"
+GCC_VERSION=${GCC_VERSION-4.4.0}
 
 repo-sync-from-mirror "${1}"
 
-cpuc=`cat /proc/cpuinfo  | grep processor | wc -l`
-threads=$(($cpuc * 4))
+calc_make_jobs
 
 if ! test -d objdir; then
 	mkdir objdir
@@ -68,5 +65,5 @@
 	$WITH_SYSROOT
 #../build/configure --target=$EABI --with-binutils-version=$BINUTILS_VERSION --with-gcc-version=$GCC_VERSION
 
-time -p make -j${threads}
-
+# MAKE_TARGETS is empty by default
+time -p make -j$MAKE_JOBS $MAKE_TARGETS

=== modified file 'build-scripts/helpers'
--- build-scripts/helpers	2011-04-25 17:11:32 +0000
+++ build-scripts/helpers	2011-04-29 14:25:49 +0000
@@ -18,4 +18,11 @@
     echo ----------------------------
     mv temp-manifest.xml .repo/manifest.xml
     time repo sync $REPO_QUIET -j8
-}
\ No newline at end of file
+}
+
+calc_make_jobs () {
+    if [ -z "$MAKE_JOBS" ]; then
+        cpuc=`cat /proc/cpuinfo  | grep processor | wc -l`
+        MAKE_JOBS=$(($cpuc * 4))
+    fi
+}