Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions tur-chromium/chromium-stable/0000-patches-desc
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
Patches 0001-0999 are reserved for the building system of chromium.

Patches 1001-2999 are reserved to make chromium work properly on Termux.

1001-1499 are reserved for chromium (base, content, etc.).
1501-1599 are reserved for angle, blink, swiftshader and v8.
2001-2999 are reserved for other 3rd-party libraries and mixed patches.

Patches 6001-6999 are reserved for some patches that cherry-picks or reverts a commit.

Patches 7001-7999 are reserved for some patches related to compiler features or bugs.

Patches 8001-8999 are reserved for some patches that adds missing includes or namespaces.
12 changes: 0 additions & 12 deletions tur-chromium/chromium-stable/0001-fix-missing-build-deps.patch

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -960,8 +960,8 @@
} else if (current_cpu == "arm") {
if (is_clang && !is_android && !is_nacl &&
!(is_chromeos_lacros && is_chromeos_device)) {
- cflags += [ "--target=arm-linux-gnueabihf" ]
- ldflags += [ "--target=arm-linux-gnueabihf" ]
+ cflags += [ "--target=armv7a-linux-android24" ]
+ ldflags += [ "--target=armv7a-linux-android24" ]
}
if (!is_nacl) {
cflags += [
@@ -975,8 +975,8 @@
} else if (current_cpu == "arm64") {
if (is_clang && !is_android && !is_nacl && !is_fuchsia &&
!(is_chromeos_lacros && is_chromeos_device)) {
- cflags += [ "--target=aarch64-linux-gnu" ]
- ldflags += [ "--target=aarch64-linux-gnu" ]
+ cflags += [ "--target=aarch64-linux-android24" ]
+ ldflags += [ "--target=aarch64-linux-android24" ]
}
} else if (current_cpu == "mipsel" && !is_nacl) {
ldflags += [ "-Wl,--hash-style=sysv" ]
139 changes: 0 additions & 139 deletions tur-chromium/chromium-stable/0002-ubuntu-2404.patch

This file was deleted.

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
@@ -1913,6 +1913,11 @@
@@ -1919,6 +1912,11 @@
}
}

Expand Down
45 changes: 45 additions & 0 deletions tur-chromium/chromium-stable/0004-compiler-clang-lib-dir.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
--- a/build/config/clang/clang.gni
+++ b/build/config/clang/clang.gni
@@ -35,6 +35,9 @@
# Set to true to enable output of ThinLTO index and import files used for
# creating a Chromium MLGO corpus in the ThinLTO case.
lld_emit_indexes_and_imports = false
+
+ custom_toolchain_clang_base_path = ""
+ custom_toolchain_clang_version = ""
}

# We don't really need to collect a corpus for the host tools, just for the target.
--- a/build/config/clang/BUILD.gn
+++ b/build/config/clang/BUILD.gn
@@ -5,6 +5,8 @@
import("//build/config/rust.gni")
import("clang.gni")

+import("//v8/gni/snapshot_toolchain.gni")
+
if (is_ios) {
import("//build/config/ios/config.gni") # For `target_environment`
}
@@ -186,6 +186,21 @@
}

_clang_lib_dir = "$clang_base_path/lib/clang/$clang_version/lib"
+
+ if (is_a_target_toolchain && current_toolchain != v8_snapshot_toolchain) {
+ _dir = "linux"
+ _clang_lib_dir = "$custom_toolchain_clang_base_path/lib/clang/$custom_toolchain_clang_version/lib"
+ if (current_cpu == "x64") {
+ _suffix = "-x86_64-android"
+ } else if (current_cpu == "arm") {
+ _suffix = "-arm-android"
+ } else if (current_cpu == "arm64") {
+ _suffix = "-aarch64-android"
+ } else {
+ assert(false) # Unhandled cpu type
+ }
+ }
+
_lib_file = "${_prefix}clang_rt.${_libname}${_suffix}.${_ext}"
libs = [ "$_clang_lib_dir/$_dir/$_lib_file" ]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
--- a/build/config/rust.gni
+++ b/build/config/rust.gni
@@ -7,6 +7,8 @@
import("//build/config/sanitizers/sanitizers.gni")
import("//build/toolchain/toolchain.gni")

+import("//v8/gni/snapshot_toolchain.gni")
+
if (is_android) {
import("//build/config/android/config.gni")
}
@@ -98,6 +100,8 @@
# a platform. Mostly applicable to Windows, where new versions can handle ANSI
# escape sequences but it's not reliable in general.
force_rustc_color_output = false
+
+ custom_target_rust_abi_target = ""
}

# Use a separate declare_args so these variables' defaults can depend on the
@@ -165,7 +169,7 @@
# TODO(crbug.com/1278030): To build unit tests for Android we need to build
# them as a dylib and put them into an APK. We should reuse all the same logic
# for gtests from the `//testing/test:test` template.
-can_build_rust_unit_tests = toolchain_has_rust && !is_android
+can_build_rust_unit_tests = toolchain_has_rust && !is_android && false

# We want to store rust_sysroot as a source-relative variable for ninja
# portability. In practice if an external toolchain was specified, it might
@@ -280,6 +284,12 @@
}
}

+if (!toolchain_for_rust_host_build_tools && current_toolchain != v8_snapshot_toolchain && current_toolchain != host_toolchain) {
+ if (custom_target_rust_abi_target != "") {
+ rust_abi_target = custom_target_rust_abi_target
+ }
+}
+
assert(!toolchain_has_rust || rust_abi_target != "")

# This variable is passed to the Rust libstd build.
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
--- a/build/config/c++/c++.gni
+++ b/build/config/c++/c++.gni
@@ -6,6 +6,8 @@
import("//build/config/sanitizers/sanitizers.gni")
import("//build_overrides/build.gni")

+import("//v8/gni/snapshot_toolchain.gni")
+
declare_args() {
# Use in-tree libc++ (buildtools/third_party/libc++ and
# buildtools/third_party/libc++abi) instead of the system C++ library for C++
@@ -42,6 +44,8 @@

use_custom_libcxx =
use_custom_libcxx || (use_custom_libcxx_for_host && !is_a_target_toolchain)
+use_custom_libcxx =
+ use_custom_libcxx || (use_custom_libcxx_for_host && current_toolchain == v8_snapshot_toolchain)
use_custom_libcxx = use_custom_libcxx && !is_nacl

declare_args() {
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
This reverts https://github.com/chromium/chromium/commit/97c864b32a7f4d64f541e2b7bf9006d2f582082f

--- a/build/install-build-deps.py
+++ b/build/install-build-deps.py
@@ -388,8 +388,6 @@
"libxtst6",
"x11-utils",
"x11-xserver-utils",
- "xserver-xorg-core",
- "xserver-xorg-video-dummy",
"xvfb",
"zlib1g",
]
Loading
Loading