Prechádzať zdrojové kódy

cnss2: Enable Bazel DDK build

Change-Id Ied2aae354aaea8a038461f6c74f26fe4f362a05a ("cnss2: Support
the Bazel DDK") introduced the logic to transition to Bazel. Now
update Android.mk to enable that functionality.
Also enable build of cnss_utils.

Change-Id: I5b0702070d2f169d486c4526676543009b3a9487
CRs-Fixed: 3478984
Jeff Johnson 2 rokov pred
rodič
commit
9b33792f8b
2 zmenil súbory, kde vykonal 10 pridanie a 4 odobranie
  1. 9 0
      Android.mk
  2. 1 4
      wlan_platform_modules.bzl

+ 9 - 0
Android.mk

@@ -13,6 +13,15 @@ ifeq ($(ENABLE_WLAN_PLATFORM_DLKM), true)
 
 # LOCAL_PATH is a relative path to root build directory.
 LOCAL_PATH := $(call my-dir)
+LOCAL_MODULE_DDK_BUILD := true
+LOCAL_MODULE_DDK_ALLOW_UNSAFE_HEADERS := true
+LOCAL_MODULE_KO_DIRS := cnss2/cnss2.ko
+LOCAL_MODULE_KO_DIRS += cnss_utils/cnss_plat_ipc_qmi_svc.ko
+LOCAL_MODULE_KO_DIRS += cnss_utils/wlan_firmware_service.ko
+LOCAL_MODULE_KO_DIRS += cnss_genl/cnss_nl.ko
+LOCAL_MODULE_KO_DIRS += cnss_prealloc/cnss_prealloc.ko
+LOCAL_MODULE_KO_DIRS += cnss_utils/cnss_utils.ko
+LOCAL_MODULE_KO_DIRS += icnss2/icnss2.ko
 DLKM_DIR := $(TOP)/device/qcom/common/dlkm
 
 # WLAN_PLATFORM_ROOT needs to be a absolute since it will be used

+ 1 - 4
wlan_platform_modules.bzl

@@ -9,10 +9,7 @@ _module_enablement_map = {
     "icnss2": [],
     "cnss_nl": ["ALL"],
     "cnss_prealloc": ["ALL"],
-    # List specific target/variants if needed
-    "cnss_utils": [
-        "pineapple_consolidate",
-    ],
+    "cnss_utils": ["ALL"],
     "wlan_firmware_service": ["ALL"],
     "cnss_plat_ipc_qmi_svc": ["ALL"],
 }