Remove lwIP from src/inet deps in socket builds

We're getting a bunch of lwIP #defines in Linux builds, even though these builds don't use lwIP. Fix the src/inet dependency to check chip_system_config_use_lwip, which controls whether CHIP uses lwIP in its networking abstractions. This requires annotating some conditional #includes with // nogncheck because the checker doesn't preprocess the file.
project-chip · Jun 21, 2021 · f685144 · f685144
1 parent 6e64fbf
commit f685144
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/inet/BUILD.gn b/src/inet/BUILD.gn
@@ -103,7 +103,7 @@ static_library("inet") {
     "${nlio_root}:nlio",
   ]
 
-  if (chip_with_lwip) {
+  if (chip_system_config_use_lwip) {
     public_deps += [ "${chip_root}/src/lwip" ]
   }
 

diff --git a/src/inet/RawEndPoint.cpp b/src/inet/RawEndPoint.cpp
@@ -43,7 +43,7 @@
 #include <lwip/raw.h>
 #include <lwip/tcpip.h>
 #if CHIP_HAVE_CONFIG_H
-#include <lwip/lwip_buildconfig.h>
+#include <lwip/lwip_buildconfig.h>  // nogncheck
 #endif // CHIP_HAVE_CONFIG_H
 #endif // CHIP_SYSTEM_CONFIG_USE_LWIP
 

diff --git a/src/inet/UDPEndPoint.cpp b/src/inet/UDPEndPoint.cpp
@@ -42,7 +42,7 @@
 #include <lwip/tcpip.h>
 #include <lwip/udp.h>
 #if CHIP_HAVE_CONFIG_H
-#include <lwip/lwip_buildconfig.h>
+#include <lwip/lwip_buildconfig.h>  // nogncheck
 #endif // CHIP_HAVE_CONFIG_H
 #endif // CHIP_SYSTEM_CONFIG_USE_LWIP