edk2: Update CLANG prefix and Android make file
Move target architecture specific configuration to Android make file and
update CLANG prefix for ARM to use GCC bin utilities.
Change-Id: I83c77c3db179bfd703432cc1f0a2370f78b6cef3
diff --git a/AndroidBoot.mk b/AndroidBoot.mk
index 225cf18..87b783d 100644
--- a/AndroidBoot.mk
+++ b/AndroidBoot.mk
@@ -31,6 +31,15 @@
endif
TARGET_ARCHITECTURE := $(BOOTLOADER_ARCH)
+ifeq ($(TARGET_ARCHITECTURE),arm)
+ CLANG35_PREFIX := $(ANDROID_BUILD_TOP)/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-$(TARGET_GCC_VERSION)/bin/arm-linux-androideabi-
+ CLANG35_GCC_TOOLCHAIN := $(ANDROID_BUILD_TOP)/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-$(TARGET_GCC_VERSION)
+else
+ CLANG35_PREFIX := $(ANDROID_BUILD_TOP)/prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-$(TARGET_GCC_VERSION)/bin/aarch64-linux-android-
+ CLANG35_GCC_TOOLCHAIN := $(ANDROID_BUILD_TOP)/prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-$(TARGET_GCC_VERSION)
+endif
+
+
# ABL ELF output
TARGET_ABL := $(PRODUCT_OUT)/abl.elf
TARGET_EMMC_BOOTLOADER := $(TARGET_ABL)
@@ -44,7 +53,16 @@
# Top level target
$(TARGET_ABL): abl_clean | $(ABL_OUT) $(INSTALLED_KEYSTOREIMAGE_TARGET)
- $(MAKE) -C bootable/bootloader/edk2 BOOTLOADER_OUT=../../../$(ABL_OUT) all $(VERIFIED_BOOT) $(VERIFIED_BOOT_2) $(USER_BUILD_VARIANT) CLANG_BIN=$(CLANG_BIN) TARGET_ARCHITECTURE=$(TARGET_ARCHITECTURE)
+ $(MAKE) -C bootable/bootloader/edk2 \
+ BOOTLOADER_OUT=../../../$(ABL_OUT) \
+ all \
+ $(VERIFIED_BOOT) \
+ $(VERIFIED_BOOT_2) \
+ $(USER_BUILD_VARIANT) \
+ CLANG_BIN=$(CLANG_BIN) \
+ CLANG_PREFIX=$(CLANG35_PREFIX)\
+ CLANG_GCC_TOOLCHAIN=$(CLANG35_GCC_TOOLCHAIN)\
+ TARGET_ARCHITECTURE=$(TARGET_ARCHITECTURE)
.PHONY: abl