src/base/files/scoped_file_linux.cc

@@ -81,8 +81,6 @@ bool IsFDOwned(int fd) {
 
 }  // namespace base
 
-#ifndef OPENWRT_BUILD_STATIC
-
 using LibcCloseFuncPtr = int (*)(int);
 
 // Load the libc close symbol to forward to from the close wrapper.
@@ -112,5 +110,3 @@ __attribute__((visibility("default"), noinline)) int close(int fd) {
 }
 
 }  // extern "C"
-
-#endif  // OPENWRT_BUILD_STATIC

src/build/config/openwrt/BUILD.gn

@@ -32,7 +32,6 @@ config("compiler") {
   if (build_static) {
     # Musl static objects are not built with -fPIC, cannot use -static-pie.
     ldflags += [ "-static" ]
-    defines += [ "OPENWRT_BUILD_STATIC" ]
   } else if (current_cpu == "x86") {
     ldflags += [ "-Wl,--dynamic-linker=/lib/ld-musl-i386.so.1" ]
   } else if (current_cpu == "mipsel") {

src/net/cert/internal/trust_store_chrome.h

@@ -9,13 +9,9 @@
 #include "net/base/net_export.h"
 #include "net/cert/pki/trust_store.h"
 #include "net/cert/pki/trust_store_in_memory.h"
+#include "net/cert/root_store_proto_lite/root_store.pb.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"
 
-// Forward declares this so root_store.pb.h would not be a public dependency.
-namespace chrome_root_store {
-class RootStore;
-}
-
 namespace net {
 
 struct ChromeRootCertInfo {