Merge 2b50f8402734fa6084362094ebfd05bb87b7b17a on remote branch

Change-Id: I22e18fd9cff3def0564af128631901d6de613aeb

BUILD.bazel

@@ -17,6 +17,10 @@ define_modules("pitti", "consolidate")
 
 define_modules("pitti", "gki")
 
+define_modules("volcano", "consolidate")
+
+define_modules("volcano", "gki")
+
 package(
     default_visibility = [
         "//visibility:public",

core/Android.mk

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

datarmnet_dlkm_vendor_board.mk

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

define_modules.bzl

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