AndroidBoot: Switch to arm-linux-androideabi toolchain.
Remove gcc toolchain override and switch to arm-linux-androideabi
toolchain.
Change-Id: Ie2a9c9201097b53945ba9a262fa1ccec0edac99f
Signed-off-by: Srinivasarao P <spathi@codeaurora.org>
diff --git a/AndroidBoot.mk b/AndroidBoot.mk
index 1db871a..5b1c348 100644
--- a/AndroidBoot.mk
+++ b/AndroidBoot.mk
@@ -1,13 +1,9 @@
#Android makefile to build lk bootloader as a part of Android Build
-ifeq ($(BOOTLOADER_GCC_VERSION),)
-ifndef $(2ND_TARGET_GCC_VERSION)
-CROSS_COMPILE := ../../../prebuilts/gcc/linux-x86/arm/arm-eabi-$(TARGET_GCC_VERSION)/bin/arm-eabi-
+ifndef 2ND_TARGET_GCC_VERSION
+CROSS_COMPILE := ../../../prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-$(TARGET_GCC_VERSION)/bin/arm-linux-androideabi-
else
-CROSS_COMPILE := ../../../prebuilts/gcc/linux-x86/arm/arm-eabi-$(2ND_TARGET_GCC_VERSION)/bin/arm-eabi-
-endif
-else # BOOTLOADER_GCC_VERSION defined
-CROSS_COMPILE := ../../../prebuilts/gcc/linux-x86/arm/$(BOOTLOADER_GCC_VERSION)/bin/arm-eabi-
+CROSS_COMPILE := ../../../prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-$(2ND_TARGET_GCC_VERSION)/bin/arm-linux-androideabi-
endif
# Set flags if we need to include security libs