Эх сурвалжийг харах

mm-drivers: hw_fence: avoid compiling hw_fence driver for taro

hw_fence driver is not required for taro variants.
Since the Display SI 3.0 is shared with taro dev SI variant,
avoid compiling hw_fence as dlkm for taro target.

Change-Id: I84637f2546fd0818d956880fbc1bb86a30a7c916
Signed-off-by: Ingrid Gallardo <[email protected]>
Ingrid Gallardo 3 жил өмнө
parent
commit
efe7847b7a
3 өөрчлөгдсөн 11 нэмэгдсэн , 11 устгасан
  1. 1 1
      Android.mk
  2. 8 8
      mm_driver_board.mk
  3. 2 2
      mm_driver_product.mk

+ 1 - 1
Android.mk

@@ -1,7 +1,7 @@
 MM_DRIVER_PATH := $(call my-dir)
 include $(MM_DRIVER_PATH)/msm_ext_display/Android.mk
-include $(MM_DRIVER_PATH)/hw_fence/Android.mk
 ifneq ($(TARGET_BOARD_PLATFORM), taro)
+include $(MM_DRIVER_PATH)/hw_fence/Android.mk
 include $(MM_DRIVER_PATH)/sync_fence/Android.mk
 endif
 

+ 8 - 8
mm_driver_board.mk

@@ -2,17 +2,17 @@
 
 ifneq ($(TARGET_BOARD_AUTO),true)
 	ifeq ($(call is-board-platform-in-list,$(TARGET_BOARD_PLATFORM)),true)
-		BOARD_VENDOR_KERNEL_MODULES += $(KERNEL_MODULES_OUT)/msm_ext_display.ko \
+		BOARD_VENDOR_KERNEL_MODULES += $(KERNEL_MODULES_OUT)/msm_ext_display.ko
+		BOARD_VENDOR_RAMDISK_KERNEL_MODULES += $(KERNEL_MODULES_OUT)/msm_ext_display.ko
+		BOARD_VENDOR_RAMDISK_RECOVERY_KERNEL_MODULES_LOAD += $(KERNEL_MODULES_OUT)/msm_ext_display.ko
+
+		ifneq ($(TARGET_BOARD_PLATFORM), taro)
+		BOARD_VENDOR_KERNEL_MODULES += $(KERNEL_MODULES_OUT)/sync_fence.ko \
 					       $(KERNEL_MODULES_OUT)/msm_hw_fence.ko
-		BOARD_VENDOR_RAMDISK_KERNEL_MODULES += $(KERNEL_MODULES_OUT)/msm_ext_display.ko \
+		BOARD_VENDOR_RAMDISK_KERNEL_MODULES += $(KERNEL_MODULES_OUT)/sync_fence.ko \
 						       $(KERNEL_MODULES_OUT)/msm_hw_fence.ko
-		BOARD_VENDOR_RAMDISK_RECOVERY_KERNEL_MODULES_LOAD += $(KERNEL_MODULES_OUT)/msm_ext_display.ko \
+		BOARD_VENDOR_RAMDISK_RECOVERY_KERNEL_MODULES_LOAD += $(KERNEL_MODULES_OUT)/sync_fence.ko \
 					                             $(KERNEL_MODULES_OUT)/msm_hw_fence.ko
-
-		ifneq ($(TARGET_BOARD_PLATFORM), taro)
-		BOARD_VENDOR_KERNEL_MODULES += $(KERNEL_MODULES_OUT)/sync_fence.ko
-		BOARD_VENDOR_RAMDISK_KERNEL_MODULES += $(KERNEL_MODULES_OUT)/sync_fence.ko
-		BOARD_VENDOR_RAMDISK_RECOVERY_KERNEL_MODULES_LOAD += $(KERNEL_MODULES_OUT)/sync_fence.ko
 		endif
 	endif
 endif

+ 2 - 2
mm_driver_product.mk

@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0-only
 
-PRODUCT_PACKAGES += msm_ext_display.ko msm_hw_fence.ko
+PRODUCT_PACKAGES += msm_ext_display.ko
 
 ifneq ($(TARGET_BOARD_PLATFORM), taro)
-PRODUCT_PACKAGES += sync_fence.ko
+PRODUCT_PACKAGES += sync_fence.ko msm_hw_fence.ko
 endif