Skip to content

Commit

Permalink
Merge pull request #300 from teeminus/update
Browse files Browse the repository at this point in the history
  • Loading branch information
teeminus authored Dec 9, 2023
2 parents 78b3059 + 546d76a commit d420bde
Show file tree
Hide file tree
Showing 14 changed files with 392 additions and 346 deletions.
636 changes: 329 additions & 307 deletions domain_substitution.list

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion downloads.ini
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
# `http://prereleases.llvm.org/win-snapshots/LLVM-9.8.7-r123456-win64.exe`
# (link derived from [LLVM Snapshot Builds](http://llvm.org/builds/))
[llvm]
version = 17.0.4
version = 17.0.6
#Uncomment when pre-release version is used.
#url = https://prereleases.llvm.org/win-snapshots/LLVM-%(version)s-win64.exe
#Uncomment the below instead when a new enough stable version of LLVM comes around
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

--- a/chrome/installer/mini_installer/BUILD.gn
+++ b/chrome/installer/mini_installer/BUILD.gn
@@ -168,7 +168,6 @@ action("mini_installer_archive") {
@@ -170,7 +170,6 @@ action("mini_installer_archive") {
"//chrome",
"//chrome:chrome_dll",
"//chrome/browser/extensions/default_extensions",
Expand All @@ -13,7 +13,7 @@
"//third_party/icu:icudata",
--- a/chrome/tools/build/win/create_installer_archive.py
+++ b/chrome/tools/build/win/create_installer_archive.py
@@ -186,12 +186,14 @@ def GenerateDiffPatch(options, orig_file
@@ -210,12 +210,14 @@ def GenerateDiffPatch(options, orig_file
RunSystemCommand(cmd, options.verbose)

def GetLZMAExec(build_dir):
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -1535,7 +1535,7 @@ config("compiler_deterministic") {
@@ -1575,7 +1575,7 @@ config("compiler_deterministic") {
}

config("clang_revision") {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/components/download/internal/common/download_item_impl.cc
+++ b/components/download/internal/common/download_item_impl.cc
@@ -2404,7 +2404,7 @@ void DownloadItemImpl::SetDangerType(Dow
@@ -2429,7 +2429,7 @@ void DownloadItemImpl::SetDangerType(Dow
TRACE_EVENT_SCOPE_THREAD, "danger_type",
GetDownloadDangerNames(danger_type).c_str());
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

--- a/chrome/common/BUILD.gn
+++ b/chrome/common/BUILD.gn
@@ -424,7 +424,6 @@ static_library("common_lib") {
@@ -427,7 +427,6 @@ static_library("common_lib") {
]
deps += [
"//chrome/chrome_elf:chrome_elf_main_include",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Windows does not support weak symbols
--- a/base/BUILD.gn
+++ b/base/BUILD.gn
@@ -1094,7 +1094,7 @@ component("base") {
@@ -1098,7 +1098,7 @@ component("base") {
public_deps += [ "//build/rust:cxx_cppdeps" ]
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

--- a/chrome/BUILD.gn
+++ b/chrome/BUILD.gn
@@ -72,29 +72,6 @@ if (is_win && enable_resource_allowlist_
@@ -73,29 +73,6 @@ if (is_win && enable_resource_allowlist_
_chrome_resource_allowlist = "$target_gen_dir/chrome_resource_allowlist.txt"
}

Expand Down Expand Up @@ -32,7 +32,7 @@
# This does not currently work. See crbug.com/1311822.
# This target exists above chrome and it's main components in the dependency
# tree as a central place to put assert_no_deps annotations. Since this depends
@@ -141,10 +118,6 @@ if (!is_android && !is_mac) {
@@ -142,10 +119,6 @@ if (!is_android && !is_mac) {
# Windows-only deps are OK because chrome_initial uses initialexe/chrome as
# the output name for that platform.
# See crbug.com/1146571.
Expand All @@ -43,7 +43,7 @@
}

template("_chrome_exe") {
@@ -156,11 +129,7 @@ if (!is_android && !is_mac) {
@@ -157,11 +130,7 @@ if (!is_android && !is_mac) {
target(_type, target_name) {
configs -= [ "//build/config/compiler:thinlto_optimize_default" ]
configs += [ "//build/config/compiler:thinlto_optimize_max" ]
Expand All @@ -58,7 +58,7 @@
# each platform lists its own files rather than relying on filtering or
--- a/chrome/test/chromedriver/BUILD.gn
+++ b/chrome/test/chromedriver/BUILD.gn
@@ -457,11 +457,6 @@ python_library("chromedriver_py_tests")
@@ -476,11 +476,6 @@ python_library("chromedriver_py_tests")
if (is_component_build && is_mac) {
data_deps += [ "//chrome:chrome_framework" ]
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
// Removes all files from the installer directory. Returns false in case of an
// error.
bool RemoveInstallerFiles(const base::FilePath& installer_directory) {
@@ -845,11 +827,6 @@ InstallStatus UninstallProduct(const Mod
@@ -843,11 +825,6 @@ InstallStatus UninstallProduct(const Mod
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
sys.exit(e.returncode)
--- a/third_party/dawn/third_party/gn/dxc/build/message_compiler.py
+++ b/third_party/dawn/third_party/gn/dxc/build/message_compiler.py
@@ -124,24 +124,6 @@ def main():
@@ -137,24 +137,6 @@ def main():
key=lambda s: s.split()[-1])
with open(header_file, 'w') as f:
f.write(''.join(header_contents))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
// Page-related commands
#define IDC_BOOKMARK_THIS_TAB 35000
#define IDC_BOOKMARK_ALL_TABS 35001
@@ -249,7 +239,7 @@
@@ -251,7 +241,7 @@
#define IDC_CHROME_TIPS 40263
#define IDC_CHROME_WHATS_NEW 40264

Expand All @@ -46,7 +46,7 @@
#define IDC_LACROS_DATA_MIGRATION 40265
#endif

@@ -455,7 +445,7 @@
@@ -461,7 +451,7 @@
#define IDC_MEDIA_ROUTER_TOGGLE_MEDIA_REMOTING 51208

// Context menu items for media toolbar button
Expand All @@ -55,7 +55,7 @@
#define IDC_MEDIA_TOOLBAR_CONTEXT_REPORT_CAST_ISSUE 51209
#endif
#define IDC_MEDIA_TOOLBAR_CONTEXT_SHOW_OTHER_SESSIONS 51210
@@ -489,7 +479,7 @@
@@ -495,7 +485,7 @@
#define IDC_CONTENT_CONTEXT_ACCESSIBILITY_LABELS 52411
#define IDC_CONTENT_CONTEXT_ACCESSIBILITY_LABELS_TOGGLE_ONCE 52412

Expand Down
Original file line number Diff line number Diff line change
@@ -1,19 +1,27 @@
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -726,7 +726,6 @@ config("compiler") {
"/lldltocache:" +
rebase_path("$root_out_dir/thinlto-cache", root_build_dir),
"/lldltocachepolicy:$cache_policy",
- "-mllvm:-disable-auto-upgrade-debug-info",
]
} else {
ldflags += [ "-flto=thin" ]
@@ -773,7 +772,7 @@ config("compiler") {
# toolchain has this flag.
# We only use one version of LLVM within a build so there's no need to
# upgrade debug info, which can be expensive since it runs the verifier.
- ldflags += [ "-Wl,-mllvm,-disable-auto-upgrade-debug-info" ]
+ ldflags += [ "-Wl,-mllvm" ]
@@ -616,24 +616,6 @@ config("compiler") {
}
}

- # TODO(crbug.com/1488374): This causes binary size growth and potentially
- # other problems.
- # TODO(crbug.com/1491036): This isn't supported by Cronet's mainline llvm version.
- if (default_toolchain != "//build/toolchain/cros:target" &&
- !llvm_android_mainline) {
- cflags += [
- "-mllvm",
- "-split-threshold-for-reg-with-hint=0",
- ]
- if (use_thin_lto && is_a_target_toolchain) {
- if (is_win) {
- ldflags += [ "-mllvm:-split-threshold-for-reg-with-hint=0" ]
- } else {
- ldflags += [ "-Wl,-mllvm,-split-threshold-for-reg-with-hint=0" ]
- }
- }
- }
-
# TODO(crbug.com/1235145): Investigate why/if this should be needed.
if (is_win) {
cflags += [ "/clang:-ffp-contract=off" ]
Loading

0 comments on commit d420bde

Please sign in to comment.