summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>2013-01-11 00:06:05 +0100
committerBernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>2013-01-11 00:06:05 +0100
commit615fe3b4e3a6004d35aaff94bb0c9340d11e7c7e (patch)
treeac996ff71ce0a3b69ed3ed20345872f4074b7813
parent718d012cc2b91e889c135e56da90b0ffa2e82b10 (diff)
tasks/kernel.mk: Don't build perf on ANDROID_64
perf currently can't be built if the kernel architecture doesn't match userland architecture (64/32) - disable perf in that context. Change-Id: I5992d4b6712be966de306806eac35f980fe6d7a9 Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
-rw-r--r--tasks/kernel.mk4
1 files changed, 4 insertions, 0 deletions
diff --git a/tasks/kernel.mk b/tasks/kernel.mk
index f394b46..72981f7 100644
--- a/tasks/kernel.mk
+++ b/tasks/kernel.mk
@@ -17,6 +17,9 @@ TARGET_KERNEL_SOURCE ?= $(shell if [ -e $(TARGET_AUTO_KDIR) ]; then echo $(TARGE
KERNEL_SRC := $(TARGET_KERNEL_SOURCE)
+ifneq ($(strip $(ANDROID_64)),true)
+# Building perf for an architecture different from the kernel's is currently
+# not supported.
ifneq ($(strip $(BUILD_TINY_ANDROID)),true)
# We can build perf if it's included in the kernel and has the
# Android compatibility patch in
@@ -27,6 +30,7 @@ ifeq ($(INCLUDE_PERF),1)
endif
endif
endif
+endif
ifeq ($(strip $(ANDROID_64)),true)
KERNEL_TARGET := Image