diff options
| author | Divya Sharma <divyash@codeaurora.org> | 2018-09-25 14:43:30 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2020-04-24 02:58:13 -0700 |
| commit | c86259270d579f727da6fc1f6ca189a7f58b7f1f (patch) | |
| tree | 40283d3beab9c597d8fd9d289a74d4f3b3de52b8 | |
| parent | 520c5d1ba25333e61e6e3f580d7f1d58dd0b12f5 (diff) | |
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>
[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>
Signed-off-by: Swetha Chikkaboraiah <schikk@codeaurora.org>
| -rw-r--r-- | AndroidKernel.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/AndroidKernel.mk b/AndroidKernel.mk index e5ecb099e535..1e4726094308 100644 --- a/AndroidKernel.mk +++ b/AndroidKernel.mk @@ -52,11 +52,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 |