Merge "datarmnet: Use top-level makefile values for BOARD_COMMON_DIR"

This commit is contained in:
qctecmdr
2023-12-21 13:43:14 -08:00
committed by Gerrit - the friendly Code Review server

Fájl megtekintése

@@ -9,6 +9,8 @@ ifeq ($(call is-board-platform-in-list, $(RMNET_CORE_DLKM_PLATFORMS_LIST)),true)
LOCAL_PATH := $(call my-dir) LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS) include $(CLEAR_VARS)
BOARD_COMMON_DIR ?= device/qcom/common
#Enabling BAZEL #Enabling BAZEL
LOCAL_MODULE_DDK_BUILD := true LOCAL_MODULE_DDK_BUILD := true
@@ -18,7 +20,7 @@ LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT)
LOCAL_MODULE := rmnet_core.ko LOCAL_MODULE := rmnet_core.ko
LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/**/*) $(wildcard $(LOCAL_PATH)/*) LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/**/*) $(wildcard $(LOCAL_PATH)/*)
KBUILD_REQUIRED_KOS := ipam.ko KBUILD_REQUIRED_KOS := ipam.ko
DLKM_DIR := $(TOP)/device/qcom/common/dlkm DLKM_DIR := $(TOP)/$(BOARD_COMMON_DIR)/dlkm
$(warning $(DLKM_DIR)) $(warning $(DLKM_DIR))
include $(DLKM_DIR)/Build_external_kernelmodule.mk include $(DLKM_DIR)/Build_external_kernelmodule.mk
@@ -31,7 +33,7 @@ LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT)
LOCAL_MODULE := rmnet_ctl.ko LOCAL_MODULE := rmnet_ctl.ko
LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/**/*) $(wildcard $(LOCAL_PATH)/*) LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/**/*) $(wildcard $(LOCAL_PATH)/*)
KBUILD_REQUIRED_KOS := ipam.ko KBUILD_REQUIRED_KOS := ipam.ko
DLKM_DIR := $(TOP)/device/qcom/common/dlkm DLKM_DIR := $(TOP)/$(BOARD_COMMON_DIR)/dlkm
$(warning $(DLKM_DIR)) $(warning $(DLKM_DIR))
include $(DLKM_DIR)/Build_external_kernelmodule.mk include $(DLKM_DIR)/Build_external_kernelmodule.mk