Extracted additional data payload files from the setup payload

project-chip · Jan 11, 2022 · f74049d · f74049d
1 parent 1bfcf76
commit f74049d
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 6 deletions.
diff --git a/src/platform/nrfconnect/BUILD.gn b/src/platform/nrfconnect/BUILD.gn
@@ -47,7 +47,7 @@ static_library("nrfconnect") {
     "SystemPlatformConfig.h",
   ]
 
-  deps = [ "${chip_root}/src/setup_payload" ]
+  deps = [ "${chip_root}/src/setup_payload:additional_data_payload" ]
 
   public_deps = [ "${chip_root}/src/platform:platform_base" ]
 

diff --git a/src/platform/telink/BUILD.gn b/src/platform/telink/BUILD.gn
@@ -62,7 +62,8 @@ static_library("telink") {
     }
   }
 
-  public_deps += [ 
+  public_deps += [
     "${chip_root}/src/crypto",
-    "${chip_root}/src/setup_payload" ]
+    "${chip_root}/src/setup_payload:additional_data_payload",
+  ]
 }
diff --git a/src/setup_payload/BUILD.gn b/src/setup_payload/BUILD.gn
@@ -14,15 +14,26 @@
 
 import("//build_overrides/chip.gni")
 
-static_library("setup_payload") {
-  output_name = "libSetupPayload"
-
+source_set("additional_data_payload") {
   sources = [
     "AdditionalDataPayload.h",
     "AdditionalDataPayloadGenerator.cpp",
     "AdditionalDataPayloadGenerator.h",
     "AdditionalDataPayloadParser.cpp",
     "AdditionalDataPayloadParser.h",
+  ]
+
+  public_deps = [
+    "${chip_root}/src/crypto",
+    "${chip_root}/src/lib/core",
+    "${chip_root}/src/lib/support",
+  ]
+}
+
+static_library("setup_payload") {
+  output_name = "libSetupPayload"
+
+  sources = [
     "Base38.h",
     "Base38Decode.cpp",
     "Base38Decode.h",
@@ -45,6 +56,7 @@ static_library("setup_payload") {
   cflags = [ "-Wconversion" ]
 
   public_deps = [
+    ":additional_data_payload",
     "${chip_root}/src/crypto",
     "${chip_root}/src/lib/core",
     "${chip_root}/src/lib/support",