Wrap all nlfaultinjection logic with build flag chip_with_nlfaultinje…

…ction (project-chip#22004)
isiu-apple · Sep 16, 2022 · f20ea8a · f20ea8a
1 parent e39572d
commit f20ea8a
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/src/inet/BUILD.gn b/src/inet/BUILD.gn
@@ -88,7 +88,6 @@ static_library("inet") {
     "InetArgParser.h",
     "InetError.cpp",
     "InetError.h",
-    "InetFaultInjection.h",
     "InetInterface.cpp",
     "InetInterface.h",
     "InetLayer.h",
@@ -132,7 +131,10 @@ static_library("inet") {
   }
 
   if (chip_with_nlfaultinjection) {
-    sources += [ "InetFaultInjection.cpp" ]
+    sources += [
+      "InetFaultInjection.cpp",
+      "InetFaultInjection.h",
+    ]
     public_deps += [ "${nlfaultinjection_root}:nlfaultinjection" ]
   }
 

diff --git a/src/inet/tests/BUILD.gn b/src/inet/tests/BUILD.gn
@@ -35,8 +35,6 @@ static_library("helpers") {
     "TestInetCommonOptions.h",
     "TestInetCommonPosix.cpp",
     "TestInetLayerCommon.cpp",
-    "TestSetupFaultInjection.h",
-    "TestSetupFaultInjectionPosix.cpp",
     "TestSetupSignalling.h",
     "TestSetupSignallingPosix.cpp",
   ]
@@ -45,6 +43,13 @@ static_library("helpers") {
     sources += [ "TestInetLayer.cpp" ]
   }
 
+  if (chip_with_nlfaultinjection) {
+    sources += [
+      "TestSetupFaultInjection.h",
+      "TestSetupFaultInjectionPosix.cpp",
+    ]
+  }
+
   cflags = [ "-Wconversion" ]
 
   public_deps = [

diff --git a/src/system/BUILD.gn b/src/system/BUILD.gn
@@ -177,7 +177,6 @@ static_library("system") {
     "SystemError.cpp",
     "SystemError.h",
     "SystemEvent.h",
-    "SystemFaultInjection.h",
     "SystemLayer.cpp",
     "SystemLayer.h",
     "SystemLayerImpl.h",
@@ -219,7 +218,10 @@ static_library("system") {
   }
 
   if (chip_with_nlfaultinjection) {
-    sources += [ "SystemFaultInjection.cpp" ]
+    sources += [
+      "SystemFaultInjection.cpp",
+      "SystemFaultInjection.h",
+    ]
     public_deps += [ "${nlfaultinjection_root}:nlfaultinjection" ]
   }
 }