Merge lp:~milo/linaro-android-build-tools/bug1012645 into lp:linaro-android-build-tools

[Milo Casagrande]

Hello there,

as discussed on IRC with Paul and as reported in the bug, the build-android-toolchain-linaro script does not support seeded build yet.

This merge prposal should fix this problem, adding an if test on the REPO_SEED_URL variable, as used in the build-android script.

[Milo Casagrande (milo)]

I didn't even notice, my diff also introduced other changes: my editor converted tabs into spaces, but I suppress space-diffs from the output when checking.

[Paul Sokolovsky (pfalcon)]

One comment I would have is that it makes sense to separate actual functional changes from reformattings, etc. - it complicates code review otherwise. (And generally, have good reasons to reformat code, like separate ticket/BP specifically for that.)

review: Approve

=== modified file 'build-scripts/build-android-toolchain-linaro'
--- build-scripts/build-android-toolchain-linaro	2012-04-20 13:51:27 +0000
+++ build-scripts/build-android-toolchain-linaro	2012-06-13 12:42:37 +0000
@@ -8,17 +8,22 @@
 
 source "${BUILD_SCRIPT_ROOT}"/helpers
 
-repo-sync-from-mirror "${1}"
+if [ -n "$REPO_SEED_URL" ]; then
+    repo-sync-from-seed "${1}"
+else
+    repo-sync-from-mirror "${1}"
+fi
+
 calc_make_jobs
 
 GCC_SRC_TYPE="unk"
 
 WITH_SYSROOT=
 if test -n "$SYSROOT_NDK_URL"; then
-	wget -q "$SYSROOT_NDK_URL"
-	NDK_FILE=`get_url_basename "$SYSROOT_NDK_URL"`
-	tar xf $NDK_FILE
-	WITH_SYSROOT=--with-sysroot=`echo $PWD/android-ndk-*/platforms/android-9/arch-arm/`
+    wget -q "$SYSROOT_NDK_URL"
+    NDK_FILE=`get_url_basename "$SYSROOT_NDK_URL"`
+    tar xf $NDK_FILE
+    WITH_SYSROOT=--with-sysroot=`echo $PWD/android-ndk-*/platforms/android-9/arch-arm/`
 fi
 
 TOOLCHAIN_PREFIX=/tmp/android-toolchain-eabi
@@ -105,7 +110,7 @@
 
 # Dump version of built gcc(s)
 for i in $TOOLCHAIN_PREFIX/bin/*-gcc; do
-	$i -v
+    $i -v
 done
 
 # add EULA suport