datarmnet-ext: Enable rmnet_offload compilation for taro

Port and adjust code as needed to enable compilation of
rmnet_offload.ko for taro.

Change-Id: Iecc502222dbb65b12e0f7b9625346346dfdf2f15
Signed-off-by: Conner Huff <[email protected]>

datarmnet_ext_dlkm_vendor_board.mk

@@ -1,8 +1,12 @@
 #Build rmnet modules
-DATA_DLKM_BOARD_PLATFORMS_LIST := lahaina
+DATA_OFFLOAD_DLKM_BOARD_PLATFORMS_LIST := lahaina
+DATA_OFFLOAD_DLKM_BOARD_PLATFORMS_LIST += taro
+DATA_SHS_DLKM_BOARD_PLATFORMS_LIST := lahaina
 ifneq ($(TARGET_BOARD_AUTO),true)
-ifeq ($(call is-board-platform-in-list,$(DATA_DLKM_BOARD_PLATFORMS_LIST)),true)
+ifeq ($(call is-board-platform-in-list,$(DATA_OFFLOAD_DLKM_BOARD_PLATFORMS_LIST)),true)
 BOARD_VENDOR_KERNEL_MODULES += $(KERNEL_MODULES_OUT)/rmnet_offload.ko
+endif
+ifeq ($(call is-board-platform-in-list,$(DATA_SHS_DLKM_BOARD_PLATFORMS_LIST)),true)
 BOARD_VENDOR_KERNEL_MODULES += $(KERNEL_MODULES_OUT)/rmnet_shs.ko
 endif
 endif

offload/Android.mk

@@ -2,26 +2,19 @@ ifneq ($(TARGET_BOARD_AUTO),true)
 ifneq ($(TARGET_PRODUCT),qssi)
 
 RMNET_OFFLOAD_DLKM_PLATFORMS_LIST := lahaina
+RMNET_OFFLOAD_DLKM_PLATFORMS_LIST += taro
 
 ifeq ($(call is-board-platform-in-list, $(RMNET_OFFLOAD_DLKM_PLATFORMS_LIST)),true)
 LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
 LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT)
-
 LOCAL_MODULE := rmnet_offload.ko
-LOCAL_SRC_FILES := \
-	rmnet_offload_state.c \
-	rmnet_offload_main.c \
-	rmnet_offload_engine.c \
-	rmnet_offload_tcp.c \
-	rmnet_offload_udp.c \
-	rmnet_offload_stats.c \
-	rmnet_offload_knob.c
-
+LOCAL_SRC_FILES   := $(wildcard $(LOCAL_PATH)/**/*) $(wildcard $(LOCAL_PATH)/*)
 
 #path from build top to the core directory
-RMNET_CORE_PATH := vendor/qcom/opensource/datarmnet/core
+DATARMNET_CORE_PATH := datarmnet/core
+RMNET_CORE_PATH := vendor/qcom/opensource/$(DATARMNET_CORE_PATH)
 DLKM_DIR := $(TOP)/device/qcom/common/dlkm
 #absolute path to the build directory. Can't use $(TOP) here since
 #that resolves to ., and we pass this to Kbuild, where . is different
@@ -30,14 +23,15 @@ RMNET_CORE_INC_DIR := $(shell pwd)/$(RMNET_CORE_PATH)
 #pass variables down to Kbuild environment
 KBUILD_OPTIONS := RMNET_CORE_INC_DIR=$(RMNET_CORE_INC_DIR)
 KBUILD_OPTIONS += RMNET_CORE_PATH=$(RMNET_CORE_PATH)
+KBUILD_OPTIONS += DATARMNET_CORE_PATH=$(DATARMNET_CORE_PATH)
 KBUILD_OPTIONS_GKI := RMNET_CORE_INC_DIR=$(RMNET_CORE_INC_DIR)
 KBUILD_OPTIONS_GKI += RMNET_CORE_PATH=$(RMNET_CORE_PATH)/gki
 
 #Must be built after the core rmnet module
-LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/$(RMNET_CORE_PATH)/rmnet_core.ko
-LOCAL_ADDITIONAL_DEPENDENCIES_GKI := $(TARGET_OUT_INTERMEDIATES)/$(RMNET_CORE_PATH)/gki/rmnet_core.ko
+LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/DLKM_OBJ/$(RMNET_CORE_PATH)/rmnet_core.ko
+LOCAL_ADDITIONAL_DEPENDENCIES_GKI := $(TARGET_OUT_INTERMEDIATES)/DLKM_OBJ/$(RMNET_CORE_PATH)/gki/rmnet_core.ko
 
-include $(DLKM_DIR)/AndroidKernelModule.mk
+include $(DLKM_DIR)/Build_external_kernelmodule.mk
 
 endif #End of check for target
 endif #End of Check for qssi target

offload/Kbuild

@@ -1,6 +1,3 @@
-#rmnet_perf needs the symbols from the core driver module
-KBUILD_EXTRA_SYMBOLS := $(shell pwd)/../../$(RMNET_CORE_PATH)/Module.symvers
-
 obj-m += rmnet_offload.o
 #Need core headers
 ccflags-y := -I$(RMNET_CORE_INC_DIR) \

offload/Makefile

@@ -2,12 +2,15 @@
 RMNET_OFFLOAD_SELECT := CONFIG_RMNET_OFFLOAD=m
 KBUILD_OPTIONS += $(RMNET_OFFLOAD_SELECT)
 KBUILD_OPTIONS += $(KBUILD_EXTRA) # Extra config if any
+KBUILD_EXTRA_SYMBOLS := $(M)/../../$(DATARMNET_CORE_PATH)/Module.symvers
+
+M ?= $(shell pwd)
 
 all:
-	$(MAKE) -C $(KERNEL_SRC) M=$(shell pwd) modules $(KBUILD_OPTIONS)
+	$(MAKE) -C $(KERNEL_SRC) M=$(M) modules $(KBUILD_OPTIONS) $(KBUILD_EXTRA_SYMBOLS)
 
 modules_install:
-	$(MAKE) INSTALL_MOD_STRIP=1 -C $(KERNEL_SRC) M=$(shell pwd) modules_install
+	$(MAKE) INSTALL_MOD_STRIP=1 -C $(KERNEL_SRC) M=$(M) modules_install
 
 clean:
-	$(MAKE) -C $(KERNEL_SRC) M=$(PWD) clean
+	$(MAKE) -C $(KERNEL_SRC) M=$(M) clean