Merge tag 'AU_LINUX_ANDROID_LA.HB.1.1.1.05.01.01.063.362' into HEAD
* commit '3226f501f467434bf099f84b867a792fa8d7f6a7':
app: aboot: Assert when reading or writing from rpmb fails
platform: msm_shared: Return negative value when reading or writing to rpmb fails
platform: msm_shared: Add support for rpmb_wr_count = 32 for emmc 5.1 and above
target: msm8996: Move the charging after storage init
dev: gcdb: display: tune 8909 SKUT panel with gamma 2.2
platform: msm_shared: add support for new nand card
platform: wdog: Do not disable watch dog debug when wdog is initialised.
Change-Id: I8d1ac9c9992d66f5a5abe62a90d926a173e091ed
diff --git a/AndroidBoot.mk b/AndroidBoot.mk
index 1b336e3..713863b 100644
--- a/AndroidBoot.mk
+++ b/AndroidBoot.mk
@@ -1,10 +1,14 @@
#Android makefile to build lk bootloader as a part of Android Build
-ifndef 2ND_TARGET_GCC_VERSION
+ifeq ($(BOOTLOADER_GCC_VERSION),)
+ifndef $(2ND_TARGET_GCC_VERSION)
CROSS_COMPILE := ../../../prebuilts/gcc/linux-x86/arm/arm-eabi-$(TARGET_GCC_VERSION)/bin/arm-eabi-
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-
+endif
# Set flags if we need to include security libs
ifeq ($(TARGET_BOOTIMG_SIGNED),true)