Skip to content

Commit

Permalink
ANDROID_BUILD_TOP is deprecated.
Browse files Browse the repository at this point in the history
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>
[snaseem@codeaurora.org: Ignoring TARGET_KERNEL_CROSS_COMPILE_PREFIX part
as it was intentionally removed in 4.9]
Signed-off-by: Shadab Naseem <snaseem@codeaurora.org>
  • Loading branch information
Divya Sharma authored and Shadab Naseem committed Jan 23, 2019
1 parent 4b0f86a commit 9ad4116
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions AndroidKernel.mk
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,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
Expand Down

0 comments on commit 9ad4116

Please sign in to comment.