Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8e093f64 authored by Koushik Dutta's avatar Koushik Dutta
Browse files

kernel.mk: Also search PRODUCT_COPY_FILES for the kernel copy, as that is how AOSP does it now. 

Change-Id: Id2d1cf079694d1996d4a85d8435c2e4562e5d444
parent 57a0a2e8

core/tasks/kernel.mk

+13 −1
Original line number Diff line number Diff line
@@ -23,6 +23,17 @@ endif 


ifeq "$(wildcard $(KERNEL_SRC) )" ""

    ifneq ($(TARGET_PREBUILT_KERNEL),)

        HAS_PREBUILT_KERNEL := true

        NEEDS_KERNEL_COPY := true

    else

        $(foreach cf,$(PRODUCT_COPY_FILES), \

            $(eval _src := $(call word-colon,1,$(cf))) \

            $(eval _dest := $(call word-colon,2,$(cf))) \

            $(ifeq kernel,$(_dest), \

                $(eval HAS_PREBUILT_KERNEL := true)))

    endif



    ifneq ($(HAS_PREBUILT_KERNEL),)

        $(warning ***************************************************************)

        $(warning * Using prebuilt kernel binary instead of source              *)

        $(warning * THIS IS DEPRECATED, AND WILL BE DISCONTINUED                *)
@@ -138,10 +149,11 @@ endif # FULL_KERNEL_BUILD 


## Install it



ifeq ($(NEEDS_KERNEL_COPY),true)

file := $(INSTALLED_KERNEL_TARGET)

ALL_PREBUILT += $(file)

$(file) : $(KERNEL_BIN) | $(ACP)

	$(transform-prebuilt-to-target)



ALL_PREBUILT += $(INSTALLED_KERNEL_TARGET)

endif