commit 36db63f13fb0f6c8dbec415344aa955c4c8aeb18
author Ashwini Muduganti <amudug@codeaurora.org> Tue Dec 12 14:20:38 2017 -0800
committer Pengxuan Zheng <pzheng@codeaurora.org> Thu Jan 11 17:31:31 2018 -0800
tree fe186c6ab07811a1dadd3a10c2c4a3e532d0e586
parent 31ffbcf7be54f0e4a40e407b1f5c2d1aceca1d30

edk2: SDLLVM path update in AndroidBoot makefile

If SDLLVM path is defined as absolute path, do not append Android root path again.

Change-Id: Ic465fd47ac4226635b141049683f03c5408b9c01

AndroidBoot.mk

diff --git a/AndroidBoot.mk b/AndroidBoot.mk
index 87b783d..6742041 100644
--- a/AndroidBoot.mk
+++ b/AndroidBoot.mk
@@ -1,7 +1,16 @@
 #Android makefile to build bootloader as a part of Android Build
-CLANG_BIN := $(ANDROID_BUILD_TOP)/$(SDCLANG_PATH)/
+ifeq ($(shell echo $(SDCLANG_PATH) | head -c 1),/)
+  CLANG_BIN := $(SDCLANG_PATH)/
+else
+  CLANG_BIN := $(ANDROID_BUILD_TOP)/$(SDCLANG_PATH)/
+endif
+
 ifneq ($(wildcard $(SDCLANG_PATH_2)),)
-	CLANG_BIN := $(ANDROID_BUILD_TOP)/$(SDCLANG_PATH_2)/
+  ifeq ($(shell echo $(SDCLANG_PATH_2) | head -c 1),/)
+    CLANG_BIN := $(SDCLANG_PATH_2)/
+  else
+    CLANG_BIN := $(ANDROID_BUILD_TOP)/$(SDCLANG_PATH_2)/
+  endif
 endif
 
 ifeq ($(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SUPPORTS_VERITY),true)