commit 05bc3069b491efe2f8e8c58570749c2b69068e14
author Treehugger Robot <treehugger-gerrit@google.com> Tue Sep 15 08:38:04 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Sep 15 08:38:04 2020 +0000
tree a3e9b3b2c9bcc59f2f9e0c116d2e3088c91cd075
parent 560e00e5f2e7f00a414570e7d4b11aaee726c7a1
parent e564c7a9bfede2aadd8d43b0759331c9b11edf1d

Merge "hikey960: Avoid failures if sdcardfs.ko isn't present" am: ef1cddcc85 am: 45769a06bc am: 2aa1c2bf06 am: e564c7a9bf

Original change: https://android-review.googlesource.com/c/device/linaro/hikey/+/1427768

Change-Id: I890fcacd143d72e5012c45126eef1eb31d6a00a8

hikey960.mk

diff --git a/hikey960.mk b/hikey960.mk
index 0107fad..3a979f8 100644
--- a/hikey960.mk
+++ b/hikey960.mk
@@ -47,10 +47,11 @@
 ifneq ($(HIKEY_USES_GKI),)
   HIKEY_MOD_DIR := device/linaro/hikey-kernel/hikey960/$(TARGET_KERNEL_USE)
   HIKEY_MODS := $(wildcard $(HIKEY_MOD_DIR)/*.ko)
+  SDCARDFS_KO := $(wildcard $(HIKEY_MOD_DIR)/sdcardfs*.ko)
   ifneq ($(HIKEY_MODS),)
     BOARD_VENDOR_KERNEL_MODULES += $(HIKEY_MODS)
     BOARD_VENDOR_RAMDISK_KERNEL_MODULES += \
 	$(HIKEY_MOD_DIR)/ion_cma_heap.ko \
-	$(HIKEY_MOD_DIR)/sdcardfs.ko
+	$(SDCARDFS_KO)
   endif
 endif