Merge "Check product type before enabling driver"

dsp_kernel_board.mk

@@ -1,7 +1,9 @@
 ifneq ($(TARGET_KERNEL_DLKM_DISABLE), true)
+ifneq ($(ENABLE_HYP), true)
 ifeq ($(call is-board-platform-in-list,$(TARGET_BOARD_PLATFORM)),true)
 BOARD_VENDOR_KERNEL_MODULES += $(KERNEL_MODULES_OUT)/frpc-adsprpc.ko
 #BOARD_VENDOR_KERNEL_MODULES += $(KERNEL_MODULES_OUT)/frpc-trusted-adsprpc.ko
 BOARD_VENDOR_KERNEL_MODULES += $(KERNEL_MODULES_OUT)/cdsp-loader.ko
 endif
-endif
+endif
+endif

dsp_kernel_product.mk

@@ -1,5 +1,7 @@
 ifneq ($(TARGET_KERNEL_DLKM_DISABLE), true)
+ifneq ($(ENABLE_HYP), true)
 PRODUCT_PACKAGES += frpc-adsprpc.ko
 #PRODUCT_PACKAGES += frpc_trusted-adsprpc.ko
 PRODUCT_PACKAGES += cdsp-loader.ko
-endif
+endif
+endif

product.mk

@@ -1,2 +1,4 @@
+ifneq ($(ENABLE_HYP), true)
 PRODUCT_PACKAGES += frpc-adsprpc.ko
 #PRODUCT_PACKAGES += cdsp-loader.ko
+endif