Commit 12b93648 authored Sep 25, 2018 by Divya Sharma Committed by Prasad Sodagudi Oct 27, 2018

ANDROID_BUILD_TOP is deprecated.



ANDROID_BUILD_TOP variable is deprecated and thus all paths are assumed
to be relative to the top directory. However, this is causing problem
when some of the paths are constructed in the Android build system and
used in the non-Android makefiles that are usually executed NOT at the
top directory but at a sub directory using -C option. As a result, the
relative path from the Android build system become invalid in the
non-Android makefiles.

In order to overcome the restriction, ANDROID_BUILD_TOP is manually
constructed when invoking the non-Android makefiles by using $$(pwd).
The non-Android makefiles are expected to construct the absolute path
by prepending ANDROID_BUILD_TOP to any path that came from the Android
build system.

Change-Id: Ia2e380cf329f56c8d36ad8dbde90d6a655f9509a
Signed-off-by: Divya Sharma <divyash@codeaurora.org>
Signed-off-by: Bruce Levy <blevy@codeaurora.org>
Signed-off-by: Prasad Sodagudi <psodagud@codeaurora.org>

parent 9aaa4fce

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