commit f36354e97f79eb8f53c70b654c38f2ce7dcc3fb5
author John Stultz <john.stultz@linaro.org> Tue Jan 14 00:10:06 2020 +0000
committer John Stultz <john.stultz@linaro.org> Tue Jan 14 00:50:59 2020 +0000
tree afff93644b9809ce45c5e704daf4261ed4a014f5
parent 0cc0a3bb8a1c415f0be7764533b2a379f71b1fec

db845c: Update userland build to use dragonboard-kernel project and build boot.img

This patch updates the userland build to built a boot.img
from prebuilt kernel/modules in the dragonboard-kernel project.

At the moment, there is nothing in the dragonboard-kernel
project, but once we do add the prebuilt files, we'll want
this change.

Change-Id: I6b9ce745c378ea50e176e9c8ed67336953766fa2
Signed-off-by: John Stultz <john.stultz@linaro.org>

db845c.mk

diff --git a/db845c.mk b/db845c.mk
index 3d44eb3..721a9ad 100644
--- a/db845c.mk
+++ b/db845c.mk
@@ -1,3 +1,8 @@
+ifndef TARGET_KERNEL_USE
+TARGET_KERNEL_USE := mainline
+endif
+DB845C_KERNEL_DIR := device/linaro/dragonboard-kernel/android-$(TARGET_KERNEL_USE)
+
 # Inherit the full_base and device configurations
 $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
 $(call inherit-product, device/linaro/dragonboard/db845c/device.mk)
@@ -9,10 +14,12 @@
 PRODUCT_DEVICE := db845c
 PRODUCT_BRAND := Android
 
-ifneq ($(DB845C_USES_GKI),)
-# The path here need to be finalized (ideally in the dragonboard-kernel dir)
-DB845C_MOD_DIR := device/linaro/dragonboard/db845c-mods/
-DB845C_MODS := $(wildcard $(DB845C_MOD_DIR)/*.ko)
+ifndef DB845C_USES_GKI
+DB845C_USES_GKI := true
+endif
+
+ifeq ($(DB845C_USES_GKI), true)
+DB845C_MODS := $(wildcard $(DB845C_KERNEL_DIR)/*.ko)
 ifneq ($(DB845C_MODS),)
   BOARD_VENDOR_KERNEL_MODULES += $(DB845C_MODS)
   BOARD_VENDOR_RAMDISK_KERNEL_MODULES += $(DB845C_MODS)