Merge lp:~pundiramit/linaro-android-build-tools/labc_hardcoded_toolchain_prefix into lp:linaro-android-build-tools

[Amit Pundir]

This is the correct fix. this patch reverts previous revision 604, "build-scripts/create-user-build-script: Do not hardcode toolchain prefix:" http://bazaar.launchpad.net/~linaro-automation/linaro-android-build-tools/trunk/revision/604.

[lp:~pundiramit/linaro-android-build-tools/labc_hardcoded_toolchain_prefix]

611. By Amit Pundir on 2013-05-06

user_build_script: do not hardcode toolchain prefix and revert rev. 604

[Fathi Boudra (fboudra)]

+1

review: Approve

=== modified file 'build-scripts/create-user-build-script'
--- build-scripts/create-user-build-script	2013-04-23 08:16:50 +0000
+++ build-scripts/create-user-build-script	2013-05-06 14:50:40 +0000
@@ -152,14 +152,13 @@
 	if [ -n "$TOOLCHAIN_URL" ] ; then
 		cat <<EOF
 export TOOLCHAIN_URL=${TOOLCHAIN_URL}
+export TARGET_TOOLS_PREFIX=android-toolchain-eabi/bin/arm-linux-androideabi-
+EOF
+	else
+		cat <<EOF
 export TARGET_TOOLS_PREFIX=${TARGET_TOOLS_PREFIX}
 
 EOF
-	else
-		cat <<EOF
-export TARGET_TOOLS_PREFIX=prebuilt/linux-x86/toolchain/arm-linux-androideabi-4.4.x/bin/arm-linux-androideabi-
-
-EOF
 	fi
 }