From f2bed4e6343169a10df2cdd5a87a59e5b0391b7c Mon Sep 17 00:00:00 2001 From: Sridhar Gujje Date: Mon, 7 Jul 2014 14:25:22 +0530 Subject: [PATCH] AndroidKernel.mk: Define the path where the kernel should be installed We now set the install path for the kernel image if it has not already been set earlier by the build system. Change-Id: I88d23916901ae9a96917c138a200d7e1772f02c0 Signed-off-by: Ameya Thakur Signed-off-by: Sridhar Gujje --- AndroidKernel.mk | 5 +++++ scripts/gcc-wrapper.py | 1 + 2 files changed, 6 insertions(+) diff --git a/AndroidKernel.mk b/AndroidKernel.mk index d97d3c3c9cb..588688c2df4 100644 --- a/AndroidKernel.mk +++ b/AndroidKernel.mk @@ -1,6 +1,11 @@ #Android makefile to build kernel as a part of Android Build PERL = perl +KERNEL_TARGET := $(strip $(INSTALLED_KERNEL_TARGET)) +ifeq ($(KERNEL_TARGET),) +INSTALLED_KERNEL_TARGET := $(PRODUCT_OUT)/kernel +endif + ifeq ($(TARGET_PREBUILT_KERNEL),) KERNEL_OUT := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ diff --git a/scripts/gcc-wrapper.py b/scripts/gcc-wrapper.py index 548d655085f..f503aa2edf3 100755 --- a/scripts/gcc-wrapper.py +++ b/scripts/gcc-wrapper.py @@ -41,6 +41,7 @@ import subprocess allowed_warnings = set([ "return_address.c:62", + "hci_conn.c:407", ]) # Capture the name of the object file, can find it.