commit 27308b5b1f03d5af26cf2c835cb932435686f706
author Amit Pundir <amit.pundir@linaro.org> Thu Aug 17 14:09:37 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Aug 17 14:09:37 2023 +0000
tree 8ff9f78b87c1a3ab90688d876bdaf58b9aa39bc8
parent 3e327cf74ce2c0ec9314631b0ce03e14530e2d31
parent 7cdd78df6f39db7f8d2e0c5459cd615a8a846bbb

device-common: TARGET_USES_GKI is always true am: 07776a385f am: e86a8ed32c am: 34a6185a17 am: c604f0acc2 am: 7cdd78df6f

Original change: https://android-review.googlesource.com/c/device/linaro/dragonboard/+/2711577

Change-Id: I022ab0f94e72535179566a3cd2a7e6cd044091a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

device-common.mk

diff --git a/device-common.mk b/device-common.mk
index d2d2036..c8756d9 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -15,16 +15,10 @@
 #
 
 TARGET_KERNEL_DIR ?= device/linaro/dragonboard-kernel/android-$(TARGET_KERNEL_USE)
+TARGET_MODS := $(wildcard $(TARGET_KERNEL_DIR)/*.ko)
 
-TARGET_USES_GKI ?= true
-
-ifeq ($(TARGET_USES_GKI), true)
-  TARGET_MODS := $(wildcard $(TARGET_KERNEL_DIR)/*.ko)
-  ifneq ($(TARGET_MODS),)
-    BOARD_DO_NOT_STRIP_VENDOR_RAMDISK_MODULES := true
-    BOARD_VENDOR_RAMDISK_KERNEL_MODULES := $(TARGET_MODS)
-  endif
-endif
+BOARD_DO_NOT_STRIP_VENDOR_RAMDISK_MODULES := true
+BOARD_VENDOR_RAMDISK_KERNEL_MODULES := $(TARGET_MODS)
 
 PRODUCT_SHIPPING_API_LEVEL := 31