From 93f379e6cfadfded0d262192ca69d1abc096d90e Mon Sep 17 00:00:00 2001
From: Benn Pörscke <benn.porscke@stericsson.com>
Date: Fri, 16 Dec 2011 15:04:55 +0100
Subject: Squash

Change-Id: I2fcf46d1fc4b0cd4c61e5be3654c43b80db86015
---
 Android.mk | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

(limited to 'Android.mk')

diff --git a/Android.mk b/Android.mk
index 7dffa96c00d..640cc94f302 100644
--- a/Android.mk
+++ b/Android.mk
@@ -54,6 +54,20 @@ $(KERNEL_LIBPATH)/$(LOCAL_SRC_FILES): build-kernel
 
 include $(BUILD_PREBUILT)
 
+include $(CLEAR_VARS)
+
+KERNEL_LIBPATH := $(KERNEL_OUTPUT)/arch/arm/boot
+LOCAL_PATH := $(KERNEL_LIBPATH)
+LOCAL_SRC_FILES := zImage
+LOCAL_MODULE := $(LOCAL_SRC_FILES)
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := EXECUTABLES
+LOCAL_MODULE_PATH := $(PRODUCT_OUT)
+
+$(KERNEL_LIBPATH)/$(LOCAL_SRC_FILES): build-kernel
+
+include $(BUILD_PREBUILT)
+
 # Configures, builds and installs the kernel. KERNEL_DEFCONFIG usually
 # comes from the BoardConfig.mk file, but can be overridden on the
 # command line or by an environment variable.
@@ -129,8 +143,5 @@ clean clobber : clean-kernel
 clean-kernel:
 	$(MAKE) $(PRIVATE_KERNEL_ARGS) clean
 
-$(INSTALLED_KERNEL_TARGET): $(PRODUCT_OUT)/uImage
-	ln -sf $(notdir $<) $@
-
 
 endif
-- 
cgit v1.2.3