commit 34a6185a176eee69a5b5d1c8558ce420fdfeb552
author Amit Pundir <amit.pundir@linaro.org> Thu Aug 17 08:24:17 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Aug 17 08:24:17 2023 +0000
tree 8ff9f78b87c1a3ab90688d876bdaf58b9aa39bc8
parent 44de7bee10f2bf7684cd9a5ad964d2a98749d053
parent e86a8ed32c5bfa5c24060f7556f1732cb971580c

device-common: TARGET_USES_GKI is always true am: 07776a385f am: e86a8ed32c

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

Change-Id: Ie8d5a121379369bd419d36ca54a5b9481bf2a1d8
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