M117 final

other/CrOS/chrome/BUILD.gn

@@ -365,10 +365,6 @@ if (!is_android && !is_mac) {
 
       if (is_chromeos_ash) {
         data_deps += [ "//mojo/core:shared_libraries_for_arc" ]
-        if (is_chromeos_device) {
-          configs += [ "//build/config/chromeos:print_orderfile" ]
-          configs += [ "//build/config/compiler:chrome_orderfile_config" ]
-        }
       }
 
       # These files are used by the installer so we need a public dep.
@@ -536,7 +532,7 @@ if (is_win) {
 
     sources = [ "app/chrome_exe_main_mac.cc" ]
 
-    extra_configs = [ "//build/config/compiler:wexit_time_destructors" ]
+    configs += [ "//build/config/compiler:wexit_time_destructors" ]
 
     deps = [
       ":chrome_app_strings_bundle_data",
@@ -778,7 +774,7 @@ if (is_win) {
 
       sources = [ "app/chrome_exe_main_mac.cc" ]
 
-      extra_configs = [ "//build/config/compiler:wexit_time_destructors" ]
+      configs += [ "//build/config/compiler:wexit_time_destructors" ]
 
       defines = [ "HELPER_EXECUTABLE" ]
 
@@ -1143,6 +1139,24 @@ if (is_win) {
     ]
   }
 
+  # Limit the exported symbols of the framework library.
+  config("chrome_dll_symbol_exports") {
+    inputs = [ rebase_path("app/framework.exports") ]
+    ldflags = [
+      "-Wl,-exported_symbols_list",
+      "-Wl," + rebase_path("app/framework.exports", root_build_dir),
+    ]
+  }
+
+  # Control the order of exported symbols in the framework library.
+  config("chrome_dll_symbol_order") {
+    inputs = [ rebase_path("app/framework.order") ]
+    ldflags = [
+      "-Wl,-order_file",
+      "-Wl," + rebase_path("app/framework.order", root_build_dir),
+    ]
+  }
+
   # On Mac, speed up the component build by not re-bundling the framework
   # every time it changes. Instead, place all the sources and their deps in
   # a library that the bundled framework links (and re-exports). That way
@@ -1190,16 +1204,15 @@ if (is_win) {
       frameworks = [ "Carbon.framework" ]
     }
 
-    ldflags = [
-      "-Wl,-order_file",
-      "-Wl," + rebase_path("app/framework.order", root_build_dir),
-      "-ObjC",
-    ]
+    ldflags = [ "-ObjC" ]
 
     configs += [
-      "//build/config/compiler:enable_arc",
+      ":chrome_dll_symbol_order",
       "//build/config/compiler:wexit_time_destructors",
     ]
+    if (!is_component_build && !using_sanitizer) {
+      configs += [ ":chrome_dll_symbol_exports" ]
+    }
   }
 
   mac_framework_bundle("chrome_framework") {
@@ -1252,12 +1265,16 @@ if (is_win) {
       bundle_deps += [ ":preinstalled_apps" ]
     }
 
+    configs += [ ":chrome_dll_symbol_order" ]
+    if (!is_component_build && !using_sanitizer) {
+      configs += [ ":chrome_dll_symbol_exports" ]
+    }
+
     ldflags = [
       "-compatibility_version",
       chrome_dylib_version,
       "-current_version",
       chrome_dylib_version,
-      "-Wl,-order_file," + rebase_path("app/framework.order", root_build_dir),
     ]
 
     if (!is_component_build) {
@@ -1452,7 +1469,7 @@ group("dependencies") {
     "//components/about_ui",
     "//components/devtools/devtools_pipe",
     "//components/memory_system",
-    "//components/startup_metric_utils/browser",
+    "//components/startup_metric_utils",
     "//components/sync",
     "//components/upload_list:upload_list",
     "//content/public/child",

other/CrOS/chrome/browser/memory_details_linux.cc

@@ -1,4 +1,4 @@
-// Copyright 2023 The Chromium Authors
+// Copyright 2012 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 

src/content/test/BUILD.gn

@@ -2104,7 +2104,7 @@ test("content_browsertests") {
       "//mojo/public/mojom/base",
     ]
     data_deps += [
-      "//content/shell:content_shell",
+      "//content/shell:thorium_shell",
       "//mojo/core:shared_library",
     ]
     if (use_ozone) {