Update On Fri May 23 20:34:58 CEST 2025

naiveproxy/src/base/BUILD.gn

@@ -2176,7 +2176,7 @@ component("base") {
       "process/set_process_title_linux.h",
       "system/sys_info_linux.cc",
     ]
-    if (!is_cronet_build) {
+    if (!is_android) {
       # These dependencies are not required on Android.
       sources += [
         "nix/mime_util_xdg.cc",

naiveproxy/src/base/trace_event/trace_event_stub.h

@@ -390,19 +390,19 @@ class TracedArray;
 class TracedDictionary;
 class EventContext;
 
-class StaticString {
+class BASE_EXPORT StaticString {
  public:
   template <typename T>
   StaticString(T) {}
 };
 
-class DynamicString {
+class BASE_EXPORT DynamicString {
  public:
   template <typename T>
   explicit DynamicString(T) {}
 };
 
-class TracedValue {
+class BASE_EXPORT TracedValue {
  public:
   void WriteInt64(int64_t) && {}
   void WriteUInt64(uint64_t) && {}
@@ -417,7 +417,7 @@ class TracedValue {
   TracedArray WriteArray() &&;
 };
 
-class TracedDictionary {
+class BASE_EXPORT TracedDictionary {
  public:
   TracedValue AddItem(StaticString) { return TracedValue(); }
   TracedValue AddItem(DynamicString) { return TracedValue(); }
@@ -433,7 +433,7 @@ class TracedDictionary {
   TracedArray AddArray(DynamicString);
 };
 
-class TracedArray {
+class BASE_EXPORT TracedArray {
  public:
   TracedValue AppendItem() { return TracedValue(); }
 
@@ -447,16 +447,16 @@ class TracedArray {
 template <class T>
 void WriteIntoTracedValue(TracedValue, T&&) {}
 
-struct Track {
+struct BASE_EXPORT Track {
   explicit Track(uint64_t id) {}
 };
 
-struct NamedTrack {
+struct BASE_EXPORT NamedTrack {
   template <class T>
   explicit NamedTrack(T name, uint64_t id = 0, Track parent = Track{0}) {}
 };
 
-struct Flow {
+struct BASE_EXPORT Flow {
   static inline Flow ProcessScoped(uint64_t flow_id) { return Flow(); }
   static inline Flow FromPointer(void* ptr) { return Flow(); }
   static inline Flow Global(uint64_t flow_id) { return Flow(); }

naiveproxy/src/build.sh

@@ -8,6 +8,7 @@ mkdir -p "$TMPDIR"
 if [ "$1" = debug ]; then
   out=out/Debug
   flags="
+    chrome_pgo_phase=0
     is_debug=true
     is_component_build=true"
 else
@@ -16,6 +17,7 @@ else
     is_official_build=true
     exclude_unwind_tables=true
     enable_resource_allowlist_generation=false
+    chrome_pgo_phase=2
     symbol_level=0"
 fi
 
@@ -51,7 +53,6 @@ flags="$flags"'
   treat_warnings_as_errors=false
 
   is_cronet_build=true
-  chrome_pgo_phase=2
 
   enable_base_tracing=false
   use_udev=false

naiveproxy/src/build/config/compiler/BUILD.gn

@@ -628,7 +628,7 @@ config("compiler") {
 
     # Enable ELF CREL (see crbug.com/357878242) for all platforms that use ELF
     # (excluding toolchains that use an older version of LLVM).
-    if (is_linux && !llvm_android_mainline &&
+    if (is_linux && !llvm_android_mainline && current_cpu != "arm" &&
         current_cpu != "mipsel" && current_cpu != "mips64el" &&
         default_toolchain != "//build/toolchain/cros:target") {
       cflags += [ "-Wa,--crel,--allow-experimental-crel" ]

naiveproxy/src/net/socket/client_socket_pool_manager.cc

@@ -14,6 +14,7 @@
 #include "build/build_config.h"
 #include "net/base/features.h"
 #include "net/base/load_flags.h"
+#include "net/base/net_export.h"
 #include "net/base/proxy_chain.h"
 #include "net/base/proxy_server.h"
 #include "net/dns/public/secure_dns_policy.h"
@@ -207,7 +208,7 @@ base::TimeDelta ClientSocketPoolManager::unused_idle_socket_timeout(
   return base::Seconds(kPreconnectIntervalSec);
 }
 
-int InitSocketHandleForHttpRequest(
+int NET_EXPORT InitSocketHandleForHttpRequest(
     url::SchemeHostPort endpoint,
     int request_load_flags,
     RequestPriority request_priority,