Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 022d29c5 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ANDROID_BUILD_TOP is deprecated."

parents 8d9ca22e 12b93648

AndroidKernel.mk

+3 −3
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ TARGET_KERNEL_CROSS_COMPILE_PREFIX := $(strip $(TARGET_KERNEL_CROSS_COMPILE_PREF 
ifeq ($(TARGET_KERNEL_CROSS_COMPILE_PREFIX),)

KERNEL_CROSS_COMPILE := arm-eabi-

else

KERNEL_CROSS_COMPILE := $(TARGET_KERNEL_CROSS_COMPILE_PREFIX)

KERNEL_CROSS_COMPILE := $(shell pwd)/$(TARGET_TOOLS_PREFIX)

endif



ifeq ($(KERNEL_LLVM_SUPPORT), true)
@@ -56,11 +56,11 @@ ifeq ($(KERNEL_LLVM_SUPPORT), true) 
    ifeq ($(shell echo $(SDCLANG_PATH) | head -c 1),/)

       KERNEL_LLVM_BIN := $(SDCLANG_PATH)/clang

    else

       KERNEL_LLVM_BIN := $(ANDROID_BUILD_TOP)/$(SDCLANG_PATH)/clang

       KERNEL_LLVM_BIN := $(shell pwd)/$(SDCLANG_PATH)/clang

    endif

    $(warning "Using sdllvm" $(KERNEL_LLVM_BIN))

  else

     KERNEL_LLVM_BIN := $(ANDROID_BUILD_TOP)/$(CLANG) #Using aosp-llvm compiler

     KERNEL_LLVM_BIN := $(shell pwd)/$(CLANG) #Using aosp-llvm compiler

    $(warning "Using aosp-llvm" $(KERNEL_LLVM_BIN))

  endif

endif