diff --git a/ubwcp/Android.mk b/ubwcp/Android.mk index 18891ae55e..d55687fae1 100644 --- a/ubwcp/Android.mk +++ b/ubwcp/Android.mk @@ -7,6 +7,6 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*) LOCAL_EXPORT_KO_INCLUDE_DIRS := $(LOCAL_PATH)/include/uapi LOCAL_EXPORT_KO_INCLUDE_DIRS += $(LOCAL_PATH)/include/kernel -LOCAL_MODULE := ubwcpx.ko +LOCAL_MODULE := ubwcp.ko LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT) include $(DLKM_DIR)/Build_external_kernelmodule.mk diff --git a/ubwcp/BUILD.bazel b/ubwcp/BUILD.bazel new file mode 100644 index 0000000000..38d9bae832 --- /dev/null +++ b/ubwcp/BUILD.bazel @@ -0,0 +1,4 @@ +load(":define_modules.bzl", "define_modules") + +define_modules("pineapple", "consolidate") +define_modules("pineapple", "gki") diff --git a/ubwcp/Kbuild b/ubwcp/Kbuild index 2b69d972d6..a3ac4ad95b 100644 --- a/ubwcp/Kbuild +++ b/ubwcp/Kbuild @@ -1,4 +1,4 @@ # SPDX-License-Identifier: GPL-2.0-only -ubwcpx-objs := ubwcp.o ubwcp_hw.o -obj-m += ubwcpx.o +ubwcp-objs := ubwcp_main.o ubwcp_hw.o +obj-m += ubwcp.o diff --git a/ubwcp/define_modules.bzl b/ubwcp/define_modules.bzl new file mode 100644 index 0000000000..e603953a25 --- /dev/null +++ b/ubwcp/define_modules.bzl @@ -0,0 +1,31 @@ +load("//build/kernel/kleaf:kernel.bzl", "ddk_module") +load("//build/bazel_common_rules/dist:dist.bzl", "copy_to_dist_dir") + + +def define_modules(target, variant): + tv = "{}_{}".format(target, variant) + + ddk_module( + name = "{}_ubwcp".format(tv), + out = "ubwcp.ko", + srcs = [ + "ubwcp_main.c", + "ubwcp_hw.c", + "ubwcp_hw.h", + ], + hdrs=["include/uapi/ubwcp_ioctl.h", "include/kernel/ubwcp.h"], + deps = ["//msm-kernel:all_headers"], + includes = ["include", "include/kernel"], + kernel_build = "//msm-kernel:{}".format(tv), + visibility = ["//visibility:public"] + ) + + copy_to_dist_dir( + name = "{}_ubwcp_dist".format(tv), + data = [":{}_ubwcp".format(tv)], + dist_dir = "out/target/product/{}/dlkm/lib/modules/".format(target), + flat = True, + wipe_dist_dir = False, + allow_duplicate_filenames = False, + mode_overrides = {"**/*": "644"}, + ) diff --git a/ubwcp/ubwcp.c b/ubwcp/ubwcp_main.c similarity index 100% rename from ubwcp/ubwcp.c rename to ubwcp/ubwcp_main.c diff --git a/ubwcp_kernel_product_board.mk b/ubwcp_kernel_product_board.mk index 46f92c8012..1e68affb4d 100644 --- a/ubwcp_kernel_product_board.mk +++ b/ubwcp_kernel_product_board.mk @@ -1,2 +1,2 @@ -PRODUCT_PACKAGES += ubwcpx.ko +PRODUCT_PACKAGES += ubwcp.ko diff --git a/ubwcp_kernel_vendor_board.mk b/ubwcp_kernel_vendor_board.mk index c1babcfcbc..8f8535ebd5 100644 --- a/ubwcp_kernel_vendor_board.mk +++ b/ubwcp_kernel_vendor_board.mk @@ -1,2 +1,2 @@ -BOARD_VENDOR_KERNEL_MODULES += $(KERNEL_MODULES_OUT)/ubwcpx.ko +BOARD_VENDOR_KERNEL_MODULES += $(KERNEL_MODULES_OUT)/ubwcp.ko