diff --git a/arm/build/config/compiler/BUILD.gn b/arm/build/config/compiler/BUILD.gn index f766b029..ccddde8e 100644 --- a/arm/build/config/compiler/BUILD.gn +++ b/arm/build/config/compiler/BUILD.gn @@ -343,6 +343,11 @@ config("compiler") { ldflags += [ "-B$lld_path" ] } } + + # ADDED BY ALEX313031 FOR THORIUM + if (is_clang && is_android && !is_ubsan && !is_ubsan_security) { + cflags += [ "-fwrapv" ] + } # Linker warnings. if (fatal_linker_warnings && !is_apple && current_os != "aix" && diff --git a/infra/PATCHES.md b/infra/PATCHES.md index 5fb236ea..2d773779 100644 --- a/infra/PATCHES.md +++ b/infra/PATCHES.md @@ -160,6 +160,16 @@ Patches to enable truly Portable usage > Disable Encryption and Machine ID - https://github.com/ungoogled-software/ungoogled-chromium-windows/blob/master/patches/ungoogled-chromium/windows/windows-disable-encryption.patch - https://github.com/ungoogled-software/ungoogled-chromium-windows/blob/master/patches/ungoogled-chromium/windows/windows-disable-machine-id.patch +Android Patches from Bromite: + - https://github.com/bromite/bromite/blob/master/build/patches/do-not-add-suffix-to-package-name.patch + - https://github.com/bromite/bromite/blob/master/build/patches/Enable-fwrapv-in-Clang-for-non-UBSan-builds.patch + > TODO: + - https://github.com/bromite/bromite/blob/master/build/patches/Do-not-link-with-libatomic.patch + - https://github.com/bromite/bromite/blob/master/build/patches/Disable-media-router-and-remoting-by-default.patch + - https://github.com/bromite/bromite/blob/master/build/patches/Enable-darken-websites-checkbox-in-themes.patch + - https://github.com/bromite/bromite/blob/master/build/patches/Disable-feeds-support-by-default.patch + - https://github.com/bromite/bromite/blob/master/build/patches/Add-exit-menu-item.patch + Installer patches to include unstripped and RPATH binaries, with chrome_sandbox (needed for older distros), chromedriver and content-shell being added along with an icon and .desktop file for content-shell. - Created by me. Patches for mini_installer and abseil when using AVX on Windows. Credit goes to @RobRich999 diff --git a/src/chrome/android/BUILD.gn b/src/chrome/android/BUILD.gn index c16ae272..e68124a2 100644 --- a/src/chrome/android/BUILD.gn +++ b/src/chrome/android/BUILD.gn @@ -50,7 +50,8 @@ if (current_toolchain == default_toolchain) { _default_package = "org.chromium.thorium" if (use_stable_package_name_for_trichrome) { _default_package += ".stable" - } else if (android_channel != "default") { + # CHANGED BY ALEX313031 FOR THORIUM + } else if (android_channel != "default" && android_channel != "stable") { # android-binary-size trybot may checks if an internal Chrome variant's # AndroidManifest is as expected by ensuring the differences between its # AndroidManifest and its upstream target's .AndroidManifest.expected file