Merge 52cc0e971d8661af38325409c9acaa6ee1016c77 on remote branch

Change-Id: I892e2e58db65c60d46c91f9e4eb63eb91caf4175

BUILD.bazel

@@ -12,6 +12,11 @@ define_modules("blair", "gki")
 define_modules("monaco", "consolidate")
 
 define_modules("monaco", "gki")
+
+define_modules("pitti", "consolidate")
+
+define_modules("pitti", "gki")
+
 package(
     default_visibility = [
         "//visibility:public",

core/Android.mk

@@ -3,6 +3,7 @@ ifneq ($(TARGET_BOARD_PLATFORM),qssi)
 RMNET_CORE_DLKM_PLATFORMS_LIST := pineapple
 RMNET_CORE_DLKM_PLATFORMS_LIST += blair
 RMNET_CORE_DLKM_PLATFORMS_LIST += monaco
+RMNET_CORE_DLKM_PLATFORMS_LIST += pitti
 
 ifeq ($(call is-board-platform-in-list, $(RMNET_CORE_DLKM_PLATFORMS_LIST)),true)
 #Make file to create RMNET_CORE DLKM

core/Kbuild

@@ -1,4 +1,4 @@
-ifneq (, $(filter y, $(CONFIG_ARCH_PINEAPPLE) $(CONFIG_ARCH_BLAIR) $(CONFIG_ARCH_MONACO)))
+ifneq (, $(filter y, $(CONFIG_ARCH_PINEAPPLE) $(CONFIG_ARCH_BLAIR) $(CONFIG_ARCH_MONACO) $(CONFIG_ARCH_PITTI)))
 ccflags-y	+= -DRMNET_LA_PLATFORM
 endif
 
@@ -28,7 +28,7 @@ rmnet_core-y += \
 	rmnet_qmap.o \
 	rmnet_ll_qmap.o
 
-ifneq (, $(filter y, $(CONFIG_ARCH_PINEAPPLE) $(CONFIG_ARCH_BLAIR)))
+ifneq (, $(filter y, $(CONFIG_ARCH_PINEAPPLE) $(CONFIG_ARCH_BLAIR) $(CONFIG_ARCH_PITTI)))
 obj-m += rmnet_ctl.o
 rmnet_ctl-y := \
 	rmnet_ctl_client.o \

core/Kconfig

@@ -21,7 +21,7 @@ config RMNET_CTL
 config RMNET_LA_PLATFORM
 	default y
 	bool "RMNET platform support"
-	depends on ARCH_PINEAPPLE || ARCH_BLAIR || ARCH_MONACO
+	depends on ARCH_PINEAPPLE || ARCH_BLAIR || ARCH_MONACO || ARCH_PITTI
 	help
 	  Enable the functionality gated by the RMNET_LA_PLATFORM configuration
 	  in rmnet driver.

datarmnet_dlkm_vendor_board.mk

@@ -13,6 +13,7 @@ ifeq ($(TARGET_DATARMNET_ENABLE), true)
 	DATA_DLKM_BOARD_PLATFORMS_LIST := pineapple
 	DATA_DLKM_BOARD_PLATFORMS_LIST += blair
 	DATA_DLKM_BOARD_PLATFORMS_LIST += monaco
+	DATA_DLKM_BOARD_PLATFORMS_LIST += pitti
 
 	ifneq ($(TARGET_BOARD_AUTO),true)
 		ifeq ($(call is-board-platform-in-list,$(DATA_DLKM_BOARD_PLATFORMS_LIST)),true)

define_modules.bzl

@@ -33,6 +33,11 @@ def define_modules(target, variant):
                     "core/rmnet_ctl_client.c",
                 ],
             },
+            "CONFIG_ARCH_PITTI": {
+                True: [
+                    "core/rmnet_ctl_client.c",
+                ],
+            },
         },
         kernel_build = "//msm-kernel:{}".format(kernel_build_variant),
         deps = [