소스 검색

mmrm-driver: enable Bazel compilation by default

Enabling Bazel DDK compilation by default with ENABLE_DDK_BUILD macro.

Change-Id: I45e669a68ea1814e9f52ad616b8c2318ad309805
Rakshitha Shakamuri 2 년 전
부모
커밋
4de411dfb8
3개의 변경된 파일11개의 추가작업 그리고 10개의 파일을 삭제
  1. 3 0
      Android.mk
  2. 8 7
      mmrm_modules.bzl
  3. 0 3
      mmrm_modules_build.bzl

+ 3 - 0
Android.mk

@@ -28,6 +28,7 @@ LOCAL_MODULE              := mmrm-module-symvers
 LOCAL_MODULE_STEM         := Module.symvers
 LOCAL_MODULE_KBUILD_NAME  := Module.symvers
 LOCAL_MODULE_PATH         := $(KERNEL_MODULES_OUT)
+ENABLE_DDK_BUILD          := true
 # 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
@@ -40,6 +41,7 @@ LOCAL_MODULE_KBUILD_NAME  := driver/msm-mmrm.ko
 LOCAL_MODULE_TAGS         := optional
 LOCAL_MODULE_DEBUG_ENABLE := true
 LOCAL_MODULE_PATH         := $(KERNEL_MODULES_OUT)
+ENABLE_DDK_BUILD          := true
 # 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
@@ -52,6 +54,7 @@ LOCAL_MODULE_KBUILD_NAME  := test/mmrm_test_module.ko
 LOCAL_MODULE_TAGS         := optional
 LOCAL_MODULE_DEBUG_ENABLE := true
 LOCAL_MODULE_PATH         := $(KERNEL_MODULES_OUT)
+ENABLE_DDK_BUILD          := true
 # 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

+ 8 - 7
mmrm_modules.bzl

@@ -1,7 +1,7 @@
 load(":mmrm_modules_build.bzl", "mmrm_driver_modules_entry")
 
-MSM_MMRM_PATH = "driver"
-MSM_TEST_PATH = "test"
+MMRM_DRV_PATH = "driver"
+MMRM_TEST_PATH = "test"
 
 mmrm_driver_modules = mmrm_driver_modules_entry([":mmrm_driver_headers"])
 module_entry = mmrm_driver_modules.register
@@ -10,7 +10,7 @@ module_entry = mmrm_driver_modules.register
 
 module_entry(
     name = "msm_mmrm",
-    path = MSM_MMRM_PATH + "/src",
+    path = MMRM_DRV_PATH + "/src",
     config_option = "CONFIG_MSM_MMRM",
     srcs = [
         "mmrm_clk_rsrc_mgr.c",
@@ -18,15 +18,16 @@ module_entry(
         "mmrm_debug.c",
         "mmrm_internal.c",
         "mmrm_res_parse.c",
-        "msm_mmrm.c"],
+        "msm_mmrm.c"
+        ],
 )
 
 module_entry(
     name = "msm_test",
-    path =  MSM_TEST_PATH,
+    path =  MMRM_TEST_PATH,
     config_option = "CONFIG_MSM_MMRM",
     srcs = [
         "mmrm_test_internal.c",
-        "mmrm_test.c"],
-    deps = ["//techpack/mm-drivers:%b_msm_mmrm"],
+        "mmrm_test.c"
+        ],
 )

+ 0 - 3
mmrm_modules_build.bzl

@@ -25,9 +25,6 @@ def _get_kernel_build_module_srcs(module, options, formatter):
     globbed_srcs = native.glob(["{}{}".format(module_path, formatter(src)) for src in srcs])
     return globbed_srcs
 
-def _get_kernel_build_module_deps(module, options, formatter):
-    return [formatter(dep) for dep in module.deps]
-
 def mmrm_driver_modules_entry(hdrs = []):
     module_map = {}