Merge 16536659a284900364046ced65e730269b420f6e on remote branch

Change-Id: I97536518bdeadaecf4a4d7cd4f33079b3017c97f

BUILD.bazel

@@ -74,12 +74,14 @@ ddk_headers(
 )
 
 load(":build/pineapple.bzl", "define_pineapple")
+load(":build/anorak.bzl", "define_anorak")
 load(":build/blair.bzl", "define_blair")
 load(":build/sun.bzl", "define_sun")
 load(":build/niobe.bzl", "define_niobe")
 load(":build/monaco.bzl", "define_monaco")
 
 define_pineapple()
+define_anorak()
 define_blair()
 define_niobe()
 define_monaco()

Kbuild

@@ -44,7 +44,7 @@ hdcp_qseecom_dlkm-objs := hdcp/hdcp_main.o hdcp/hdcp_smcinvoke.o hdcp/hdcp_qseec
 obj-$(CONFIG_HW_RANDOM_MSM_LEGACY) += qrng_dlkm.o
 qrng_dlkm-objs := qrng/msm_rng.o
 
-ifneq (, $(filter y, $(ARCH_QTI_VM) $(CONFIG_ARCH_PINEAPPLE) $(CONFIG_ARCH_SUN)))
+ifneq (, $(filter y, $(ARCH_QTI_VM) $(CONFIG_ARCH_PINEAPPLE) $(CONFIG_ARCH_SUN) $(CONFIG_ARCH_ANORAK)))
     include $(SSG_MODULE_ROOT)/config/sec-kernel_defconfig_smmu_proxy.conf
     LINUXINCLUDE += -include $(SSG_MODULE_ROOT)/config/sec-kernel_defconfig_smmu_proxy.h
 

build/anorak.bzl

@@ -0,0 +1,21 @@
+load(":securemsm_kernel.bzl", "define_consolidate_gki_modules")
+
+def define_anorak():
+    define_consolidate_gki_modules(
+        target = "anorak",
+        modules = [
+            "smcinvoke_dlkm",
+            "tz_log_dlkm",
+            "hdcp_qseecom_dlkm",
+            "qce50_dlkm",
+            "qcedev-mod_dlkm",
+            "qrng_dlkm",
+            "qcrypto-msm_dlkm",
+            "smmu_proxy_dlkm",
+            "qseecom_dlkm"
+        ],
+        extra_options = [
+            "CONFIG_QCOM_SMCINVOKE",
+            "CONFIG_QSEECOM_COMPAT",
+        ],
+    )