Skip to content

Commit a295b0a

Browse files
authored
chromium-stable: bump to 126.0.6478.182 (#31)
[skip ci]
1 parent c701567 commit a295b0a

File tree

70 files changed

+1979
-158
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+1979
-158
lines changed
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
Patches 0001-0999 are reserved for the building system of chromium.
2+
3+
Patches 1001-2999 are reserved to make chromium work properly on Termux.
4+
5+
1001-1499 are reserved for chromium (base, content, etc.).
6+
1501-1599 are reserved for angle, blink, swiftshader and v8.
7+
2001-2999 are reserved for other 3rd-party libraries and mixed patches.
8+
9+
Patches 6001-6999 are reserved for some patches that cherry-picks or reverts a commit.
10+
11+
Patches 7001-7999 are reserved for some patches related to compiler features or bugs.
12+
13+
Patches 8001-8999 are reserved for some patches that adds missing includes or namespaces.

tur-chromium/chromium-stable/0001-fix-missing-build-deps.patch

Lines changed: 0 additions & 12 deletions
This file was deleted.
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
--- a/build/config/compiler/BUILD.gn
2+
+++ b/build/config/compiler/BUILD.gn
3+
@@ -960,8 +960,8 @@
4+
} else if (current_cpu == "arm") {
5+
if (is_clang && !is_android && !is_nacl &&
6+
!(is_chromeos_lacros && is_chromeos_device)) {
7+
- cflags += [ "--target=arm-linux-gnueabihf" ]
8+
- ldflags += [ "--target=arm-linux-gnueabihf" ]
9+
+ cflags += [ "--target=armv7a-linux-android24" ]
10+
+ ldflags += [ "--target=armv7a-linux-android24" ]
11+
}
12+
if (!is_nacl) {
13+
cflags += [
14+
@@ -975,8 +975,8 @@
15+
} else if (current_cpu == "arm64") {
16+
if (is_clang && !is_android && !is_nacl && !is_fuchsia &&
17+
!(is_chromeos_lacros && is_chromeos_device)) {
18+
- cflags += [ "--target=aarch64-linux-gnu" ]
19+
- ldflags += [ "--target=aarch64-linux-gnu" ]
20+
+ cflags += [ "--target=aarch64-linux-android24" ]
21+
+ ldflags += [ "--target=aarch64-linux-android24" ]
22+
}
23+
} else if (current_cpu == "mipsel" && !is_nacl) {
24+
ldflags += [ "-Wl,--hash-style=sysv" ]

tur-chromium/chromium-stable/0002-ubuntu-2404.patch

Lines changed: 0 additions & 139 deletions
This file was deleted.

tur-chromium/chromium-stable/9999-compiler-warnings.patch renamed to tur-chromium/chromium-stable/0003-compiler-disable-warnings.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--- a/build/config/compiler/BUILD.gn
22
+++ b/build/config/compiler/BUILD.gn
3-
@@ -1913,6 +1913,11 @@
3+
@@ -1919,6 +1912,11 @@
44
}
55
}
66

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
--- a/build/config/clang/clang.gni
2+
+++ b/build/config/clang/clang.gni
3+
@@ -35,6 +35,9 @@
4+
# Set to true to enable output of ThinLTO index and import files used for
5+
# creating a Chromium MLGO corpus in the ThinLTO case.
6+
lld_emit_indexes_and_imports = false
7+
+
8+
+ custom_toolchain_clang_base_path = ""
9+
+ custom_toolchain_clang_version = ""
10+
}
11+
12+
# We don't really need to collect a corpus for the host tools, just for the target.
13+
--- a/build/config/clang/BUILD.gn
14+
+++ b/build/config/clang/BUILD.gn
15+
@@ -5,6 +5,8 @@
16+
import("//build/config/rust.gni")
17+
import("clang.gni")
18+
19+
+import("//v8/gni/snapshot_toolchain.gni")
20+
+
21+
if (is_ios) {
22+
import("//build/config/ios/config.gni") # For `target_environment`
23+
}
24+
@@ -186,6 +186,21 @@
25+
}
26+
27+
_clang_lib_dir = "$clang_base_path/lib/clang/$clang_version/lib"
28+
+
29+
+ if (is_a_target_toolchain && current_toolchain != v8_snapshot_toolchain) {
30+
+ _dir = "linux"
31+
+ _clang_lib_dir = "$custom_toolchain_clang_base_path/lib/clang/$custom_toolchain_clang_version/lib"
32+
+ if (current_cpu == "x64") {
33+
+ _suffix = "-x86_64-android"
34+
+ } else if (current_cpu == "arm") {
35+
+ _suffix = "-arm-android"
36+
+ } else if (current_cpu == "arm64") {
37+
+ _suffix = "-aarch64-android"
38+
+ } else {
39+
+ assert(false) # Unhandled cpu type
40+
+ }
41+
+ }
42+
+
43+
_lib_file = "${_prefix}clang_rt.${_libname}${_suffix}.${_ext}"
44+
libs = [ "$_clang_lib_dir/$_dir/$_lib_file" ]
45+
}
Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
--- a/build/config/rust.gni
2+
+++ b/build/config/rust.gni
3+
@@ -7,6 +7,8 @@
4+
import("//build/config/sanitizers/sanitizers.gni")
5+
import("//build/toolchain/toolchain.gni")
6+
7+
+import("//v8/gni/snapshot_toolchain.gni")
8+
+
9+
if (is_android) {
10+
import("//build/config/android/config.gni")
11+
}
12+
@@ -98,6 +100,8 @@
13+
# a platform. Mostly applicable to Windows, where new versions can handle ANSI
14+
# escape sequences but it's not reliable in general.
15+
force_rustc_color_output = false
16+
+
17+
+ custom_target_rust_abi_target = ""
18+
}
19+
20+
# Use a separate declare_args so these variables' defaults can depend on the
21+
@@ -165,7 +169,7 @@
22+
# TODO(crbug.com/1278030): To build unit tests for Android we need to build
23+
# them as a dylib and put them into an APK. We should reuse all the same logic
24+
# for gtests from the `//testing/test:test` template.
25+
-can_build_rust_unit_tests = toolchain_has_rust && !is_android
26+
+can_build_rust_unit_tests = toolchain_has_rust && !is_android && false
27+
28+
# We want to store rust_sysroot as a source-relative variable for ninja
29+
# portability. In practice if an external toolchain was specified, it might
30+
@@ -280,6 +284,12 @@
31+
}
32+
}
33+
34+
+if (!toolchain_for_rust_host_build_tools && current_toolchain != v8_snapshot_toolchain && current_toolchain != host_toolchain) {
35+
+ if (custom_target_rust_abi_target != "") {
36+
+ rust_abi_target = custom_target_rust_abi_target
37+
+ }
38+
+}
39+
+
40+
assert(!toolchain_has_rust || rust_abi_target != "")
41+
42+
# This variable is passed to the Rust libstd build.
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
--- a/build/config/c++/c++.gni
2+
+++ b/build/config/c++/c++.gni
3+
@@ -6,6 +6,8 @@
4+
import("//build/config/sanitizers/sanitizers.gni")
5+
import("//build_overrides/build.gni")
6+
7+
+import("//v8/gni/snapshot_toolchain.gni")
8+
+
9+
declare_args() {
10+
# Use in-tree libc++ (buildtools/third_party/libc++ and
11+
# buildtools/third_party/libc++abi) instead of the system C++ library for C++
12+
@@ -42,6 +44,8 @@
13+
14+
use_custom_libcxx =
15+
use_custom_libcxx || (use_custom_libcxx_for_host && !is_a_target_toolchain)
16+
+use_custom_libcxx =
17+
+ use_custom_libcxx || (use_custom_libcxx_for_host && current_toolchain == v8_snapshot_toolchain)
18+
use_custom_libcxx = use_custom_libcxx && !is_nacl
19+
20+
declare_args() {
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
This reverts https://github.com/chromium/chromium/commit/97c864b32a7f4d64f541e2b7bf9006d2f582082f
2+
3+
--- a/build/install-build-deps.py
4+
+++ b/build/install-build-deps.py
5+
@@ -388,8 +388,6 @@
6+
"libxtst6",
7+
"x11-utils",
8+
"x11-xserver-utils",
9+
- "xserver-xorg-core",
10+
- "xserver-xorg-video-dummy",
11+
"xvfb",
12+
"zlib1g",
13+
]

0 commit comments

Comments
 (0)