From 03b5c0224a0c9c0d381555b519e432f4f855ceb2 Mon Sep 17 00:00:00 2001 From: Jon Medhurst Date: Tue, 5 Feb 2013 10:47:42 +0000 Subject: build: Allow kernel and initrd names to be overridden Devices may want or need to give their own names for these. Change-Id: I8366c213333b8c969d06b276547c6e86fc6ebed9 Signed-off-by: Jon Medhurst --- core/Makefile | 2 +- target/board/Android.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/Makefile b/core/Makefile index aa463cd7c0..5a9ab1539f 100644 --- a/core/Makefile +++ b/core/Makefile @@ -359,7 +359,7 @@ INTERNAL_RAMDISK_FILES := $(filter $(TARGET_ROOT_OUT)/%, \ ifeq ($(TARGET_BOOTLOADER_TYPE),uboot) BUILT_RAMDISK_TARGET := $(PRODUCT_OUT)/uInitrd else -BUILT_RAMDISK_TARGET := $(PRODUCT_OUT)/ramdisk.img +BUILT_RAMDISK_TARGET := $(PRODUCT_OUT)/$(or $(INSTALLED_RAMDISK_TARGET_NAME),ramdisk.img) endif # We just build this directly to the install location. diff --git a/target/board/Android.mk b/target/board/Android.mk index 0ea276ad09..c4656f263a 100644 --- a/target/board/Android.mk +++ b/target/board/Android.mk @@ -18,7 +18,7 @@ ifneq ($(strip $(TARGET_NO_KERNEL)),true) ifeq ($(TARGET_BOOTLOADER_TYPE),uboot) INSTALLED_KERNEL_TARGET := $(PRODUCT_OUT)/uImage else - INSTALLED_KERNEL_TARGET := $(PRODUCT_OUT)/kernel + INSTALLED_KERNEL_TARGET := $(PRODUCT_OUT)/$(or $(INSTALLED_KERNEL_TARGET_NAME),kernel) endif else INSTALLED_KERNEL_TARGET := -- cgit v1.2.3