commit 45769a06bc1b55ed3ee3d8197c738859640e388a
author Treehugger Robot <treehugger-gerrit@google.com> Tue Sep 15 06:18:53 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Sep 15 06:18:53 2020 +0000
tree a3e9b3b2c9bcc59f2f9e0c116d2e3088c91cd075
parent 1527304c9a0bdca452d7700274db9957b68d0200
parent ef1cddcc85e8470f5422714172f2bc167ce7afbc

Merge "hikey960: Avoid failures if sdcardfs.ko isn't present" am: ef1cddcc85

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

Change-Id: I6e798e2b0aab8ecc9cf1ec3f5542da9fb351779f

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