From ec58d7adaf5578a030ed4a449c36bb30e4ed749b Mon Sep 17 00:00:00 2001
From: Matt White <436037+mlw@users.noreply.github.com>
Date: Wed, 13 Sep 2023 16:14:53 -0400
Subject: [PATCH] Fix layering issue for imported module

---
 Source/common/BUILD | 21 ++++++++-------------
 Source/gui/BUILD    |  8 ++++++++
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/Source/common/BUILD b/Source/common/BUILD
index cc03b7779..4cac281ad 100644
--- a/Source/common/BUILD
+++ b/Source/common/BUILD
@@ -93,10 +93,10 @@ objc_library(
     ],
 )
 
-# Note: `srcs`/`hdrs` are left unspecified here because `defines` from the
-# `SNTBlockMessage_SantaGUI` target do not propagate to `deps`.
 objc_library(
-    name = "SNTBlockMessage_CommonDeps",
+    name = "SNTBlockMessage",
+    srcs = ["SNTBlockMessage.m"],
+    hdrs = ["SNTBlockMessage.h"],
     deps = [
         ":SNTConfigurator",
         ":SNTFileAccessEvent",
@@ -106,22 +106,17 @@ objc_library(
     ],
 )
 
-objc_library(
-    name = "SNTBlockMessage",
-    srcs = ["SNTBlockMessage.m"],
-    hdrs = ["SNTBlockMessage.h"],
-    deps = [
-        ":SNTBlockMessage_CommonDeps",
-    ],
-)
-
 objc_library(
     name = "SNTBlockMessage_SantaGUI",
     srcs = ["SNTBlockMessage.m"],
     hdrs = ["SNTBlockMessage.h"],
     defines = ["SANTAGUI"],
     deps = [
-        ":SNTBlockMessage_CommonDeps",
+        ":SNTConfigurator",
+        ":SNTFileAccessEvent",
+        ":SNTLogging",
+        ":SNTStoredEvent",
+        ":SNTSystemInfo",
     ],
 )
 
diff --git a/Source/gui/BUILD b/Source/gui/BUILD
index 7c7dd00a1..e1258b2a6 100644
--- a/Source/gui/BUILD
+++ b/Source/gui/BUILD
@@ -31,6 +31,13 @@ swift_library(
     ],
 )
 
+objc_library(
+    name = "SecurityInterfaceImport",
+    sdk_frameworks = [
+        "SecurityInterface",
+    ],
+)
+
 swift_library(
     name = "SNTFileAccessMessageWindowView",
     srcs = [
@@ -38,6 +45,7 @@ swift_library(
     ],
     generates_header = 1,
     deps = [
+        ":SecurityInterfaceImport",
         "//Source/common:SNTFileAccessEvent",
     ],
 )