Merge 7859e078ed on remote branch

Change-Id: I315f89eaf96fc20381a6c527079255f14e602c4d

BUILD.bazel

@@ -77,8 +77,10 @@ load(":build/pineapple.bzl", "define_pineapple")
 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_blair()
 define_niobe()
+define_monaco()
 define_sun()

build/monaco.bzl

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