Fix layering issue for imported module

google · Sep 13, 2023 · ec58d7a · ec58d7a
1 parent ff6bf07
commit ec58d7a
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 13 deletions.
diff --git 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
@@ -31,13 +31,21 @@ swift_library(
     ],
 )
 
+objc_library(
+    name = "SecurityInterfaceImport",
+    sdk_frameworks = [
+        "SecurityInterface",
+    ],
+)
+
 swift_library(
     name = "SNTFileAccessMessageWindowView",
     srcs = [
         "SNTFileAccessMessageWindowView.swift",
     ],
     generates_header = 1,
     deps = [
+        ":SecurityInterfaceImport",
         "//Source/common:SNTFileAccessEvent",
     ],
 )