Procházet zdrojové kódy

mmrm-driver: disable mmrm-driver-test module compilation temporarily

As per the ship rules change on mmrm-driver-test project, we are
disabling the test project compilation to unblock from TP promotions,
corresponding Bazel changes will be merged soon.

Change-Id: If8db39513ea3cd35b636dfd580de595fca248f2b
Signed-off-by: Rakshitha Shakamuri <[email protected]>
Rakshitha Shakamuri před 1 rokem
rodič
revize
87665ea91f
6 změnil soubory, kde provedl 16 přidání a 36 odebrání
  1. 12 12
      Android.mk
  2. 1 9
      BUILD.bazel
  3. 1 1
      Kbuild
  4. 1 1
      mmrm_kernel_board.mk
  5. 0 11
      mmrm_modules.bzl
  6. 1 2
      target.bzl

+ 12 - 12
Android.mk

@@ -21,7 +21,7 @@ DLKM_DIR   := device/qcom/common/dlkm
 
 LOCAL_PATH := $(call my-dir)
 LOCAL_MODULE_DDK_BUILD    := true
-LOCAL_MODULE_KO_DIRS      := driver/msm-mmrm.ko test/mmrm_test_module.ko
+LOCAL_MODULE_KO_DIRS      := driver/msm-mmrm.ko
 
 include $(CLEAR_VARS)
 # For incremental compilation
@@ -46,17 +46,17 @@ LOCAL_MODULE_PATH         := $(KERNEL_MODULES_OUT)
 # BOARD_VENDOR_KERNEL_MODULES += $(LOCAL_MODULE_PATH)/$(LOCAL_MODULE)
 include $(DLKM_DIR)/Build_external_kernelmodule.mk
 
-include $(CLEAR_VARS)
-# For incremental compilation
-LOCAL_SRC_FILES           := $(wildcard $(LOCAL_PATH)/**/*) $(wildcard $(LOCAL_PATH)/*)
-LOCAL_MODULE              := mmrm_test_module.ko
-LOCAL_MODULE_KBUILD_NAME  := test/mmrm_test_module.ko
-LOCAL_MODULE_TAGS         := optional
-LOCAL_MODULE_DEBUG_ENABLE := true
-LOCAL_MODULE_PATH         := $(KERNEL_MODULES_OUT)
-# Include kp_module.ko in the /vendor/lib/modules (vendor.img)
-# BOARD_VENDOR_KERNEL_MODULES += $(LOCAL_MODULE_PATH)/$(LOCAL_MODULE)
-include $(DLKM_DIR)/Build_external_kernelmodule.mk
+# include $(CLEAR_VARS)
+# # For incremental compilation
+# LOCAL_SRC_FILES           := $(wildcard $(LOCAL_PATH)/**/*) $(wildcard $(LOCAL_PATH)/*)
+# LOCAL_MODULE              := mmrm_test_module.ko
+# LOCAL_MODULE_KBUILD_NAME  := test/mmrm_test_module.ko
+# LOCAL_MODULE_TAGS         := optional
+# LOCAL_MODULE_DEBUG_ENABLE := true
+# LOCAL_MODULE_PATH         := $(KERNEL_MODULES_OUT)
+# # Include kp_module.ko in the /vendor/lib/modules (vendor.img)
+# # BOARD_VENDOR_KERNEL_MODULES += $(LOCAL_MODULE_PATH)/$(LOCAL_MODULE)
+# include $(DLKM_DIR)/Build_external_kernelmodule.mk
 
 ifeq ($(CONFIG_MSM_MMRM_VM),y)
 	include $(CLEAR_VARS)

+ 1 - 9
BUILD.bazel

@@ -21,17 +21,9 @@ ddk_headers(
     includes = ["driver/src"]
 )
 
-ddk_headers(
-    name = "test_headers",
-    hdrs = glob([
-      "test/*.h",
-    ]),
-    includes = ["test"]
-)
-
 ddk_headers(
     name = "mmrm_driver_headers",
-    hdrs = [":mmrm_drivers_configs", "driver_headers", "test_headers"]
+    hdrs = [":mmrm_drivers_configs", "driver_headers"]
 )
 
 load(":target.bzl", "define_pineapple")

+ 1 - 1
Kbuild

@@ -5,7 +5,7 @@ LINUXINCLUDE += -include $(MMRM_ROOT)/config/waipiommrmconf.h
 ifneq ($(CONFIG_ARCH_QTI_VM), y)
 
 obj-m += driver/
-obj-m += test/
+# obj-m += test/
 
 ifeq ($(CONFIG_MSM_MMRM_VM),y)
 LINUXINCLUDE += -I$(MMRM_ROOT)/vm/common/inc/

+ 1 - 1
mmrm_kernel_board.mk

@@ -14,6 +14,6 @@ BOARD_VENDOR_KERNEL_MODULES += $(KERNEL_MODULES_OUT)/msm-mmrm.ko
 BOARD_VENDOR_RAMDISK_KERNEL_MODULES += $(KERNEL_MODULES_OUT)/msm-mmrm.ko
 BOARD_VENDOR_RAMDISK_RECOVERY_KERNEL_MODULES_LOAD += $(KERNEL_MODULES_OUT)/msm-mmrm.ko
 
-BOARD_VENDOR_KERNEL_MODULES += $(KERNEL_MODULES_OUT)/mmrm_test_module.ko
+# BOARD_VENDOR_KERNEL_MODULES += $(KERNEL_MODULES_OUT)/mmrm_test_module.ko
 endif
 endif

+ 0 - 11
mmrm_modules.bzl

@@ -1,7 +1,6 @@
 load(":mmrm_modules_build.bzl", "mmrm_driver_modules_entry")
 
 MMRM_DRV_PATH = "driver"
-MMRM_TEST_PATH = "test"
 
 mmrm_driver_modules = mmrm_driver_modules_entry([":mmrm_driver_headers"])
 module_entry = mmrm_driver_modules.register
@@ -21,13 +20,3 @@ module_entry(
         "msm_mmrm.c"
     ],
 )
-
-module_entry(
-    name = "mmrm_test_module",
-    path =  MMRM_TEST_PATH,
-    config_option = "CONFIG_MSM_MMRM",
-    srcs = [
-        "mmrm_test_internal.c",
-        "mmrm_test.c"
-    ],
-)

+ 1 - 2
target.bzl

@@ -6,7 +6,6 @@ def define_pineapple():
         target = "pineapple",
         registry = mmrm_driver_modules,
         modules = [
-            "msm-mmrm",
-            "mmrm_test_module",
+            "msm-mmrm"
         ],
 )