1 files changed, 16 insertions, 10 deletions
diff --git a/pw_cpu_exception_armv7m/BUILD.gn b/pw_cpu_exception_armv7m/BUILD.gn
index 014824807..c1206f522 100644
--- a/pw_cpu_exception_armv7m/BUILD.gn
+++ b/pw_cpu_exception_armv7m/BUILD.gn
@@ -22,17 +22,26 @@ config("default_config") {
   include_dirs = [ "public" ]
 }
 
-pw_source_set("pw_cpu_exception_armv7m") {
+pw_source_set("support") {
   public_configs = [ ":default_config" ]
-  deps = [
-    "$dir_pw_cpu_exception:facade",
+  public_deps = [
+    "$dir_pw_cpu_exception:support_facade",
     "$dir_pw_preprocessor",
+    "$dir_pw_string",
   ]
   public = [ "public/pw_cpu_exception_armv7m/cpu_state.h" ]
-  sources = [
-    "cpu_exception_entry.cc",
-    "cpu_state.cc",
+  sources = [ "cpu_state.cc" ]
+}
+
+pw_source_set("pw_cpu_exception_armv7m") {
+  public_configs = [ ":default_config" ]
+  public_deps = [
+    ":support",
+    "$dir_pw_cpu_exception:entry_facade",
+    "$dir_pw_cpu_exception:handler",
+    "$dir_pw_preprocessor",
   ]
+  sources = [ "entry.cc" ]
 }
 
 pw_test_group("tests") {
@@ -40,10 +49,7 @@ pw_test_group("tests") {
 }
 
 pw_test("cpu_exception_entry_test") {
-  deps = [
-    ":pw_cpu_exception_armv7m",
-    "$dir_pw_cpu_exception",
-  ]
+  deps = [ ":pw_cpu_exception_armv7m" ]
   sources = [ "exception_entry_test.cc" ]
 }