diff options
| author | Vishal Bhoj <vishal.bhoj@linaro.org> | 2015-06-05 16:17:28 +0000 |
|---|---|---|
| committer | Linaro Android Code Review <android-review@review.linaro.org> | 2015-06-05 16:17:28 +0000 |
| commit | 746026cefb352df1df96fdd9c3aabdd387ed6a82 (patch) | |
| tree | 48b5dce74c46f00e442586bc9e4fba22b82a5d08 | |
| parent | 222ce9483dd99969eeef9e6c4225ee447fad0bdc (diff) | |
| parent | 8fdfc33676359ed5837acbfbf4dfa89070b525b0 (diff) | |
| download | common-746026cefb352df1df96fdd9c3aabdd387ed6a82.tar.gz | |
Merge "Make sure kernel build is not invoked for emulators" into linaro-lollipop-experimental
| -rw-r--r-- | tasks/kernel.mk | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tasks/kernel.mk b/tasks/kernel.mk index 3641f10..91c74e9 100644 --- a/tasks/kernel.mk +++ b/tasks/kernel.mk @@ -1,3 +1,4 @@ +ifneq ($(strip $(TARGET_NO_KERNEL)),true) ifeq ($(strip $(TARGET_PREBUILT_KERNEL)),) ifneq ($(strip $(SHOW_COMMANDS)),) KERNEL_VERBOSE="V=1" @@ -64,7 +65,7 @@ KERNEL_COMPILER_PATHS := ../$(BUILD_OUT_EXECUTABLES) endif ifneq ($(KERNEL_LOADADDR),) - KLDR := "LOADADDR=$(KERNEL_LOADADDR)" + KLDR := "LOADADDR=$(KERNEL_LOADADDR)" else KLDR := endif @@ -299,3 +300,4 @@ combine_kernel_prebuilt : endif endif # TARGET_PREBUILT_KERNEL +endif # TARGET_NO_KERNEL |