android flags and logo padding fixes

arm/android_ARM32_args.gn

@@ -21,6 +21,7 @@ is_debug = false
 is_java_debug = false
 debuggable_apks = false
 is_cfi = true
+use_relative_vtables_abi = false
 icu_use_data_file = true
 use_cfi_cast = true
 use_gnome_keyring = false
@@ -77,11 +78,12 @@ ignore_missing_widevine_signing_cert = true
 enable_media_drm_storage = true
 # enable_media_overlay = true
 enable_hangout_services_extension = true
-rtc_use_h264 = true
+rtc_use_h264 = false
+rtc_prefer_fixed_point = true
 rtc_include_ilbc = true
 rtc_build_with_neon = false
 rtc_build_examples = false
-# rtc_enable_avx2 = true
+rtc_enable_avx2 = false
 enable_vr = true
 use_vr_assets_component = true
 enable_platform_hevc = true

arm/android_ARM64_args.gn

@@ -14,13 +14,14 @@ arm_optionally_use_neon = false
 arm_fpu = "neon"
 is_official_build = true
 is_high_end_android = true
-use_relr_relocations = false
+use_relr_relocations = true
 optimize_for_size = false
 optimize_for_speed = true
 is_debug = false
 is_java_debug = false
 debuggable_apks = false
 is_cfi = true
+use_relative_vtables_abi = false
 icu_use_data_file = true
 use_cfi_cast = true
 use_gnome_keyring = false
@@ -77,11 +78,12 @@ ignore_missing_widevine_signing_cert = true
 enable_media_drm_storage = true
 # enable_media_overlay = true
 enable_hangout_services_extension = true
-rtc_use_h264 = true
+rtc_use_h264 = false
+rtc_prefer_fixed_point = true
 rtc_include_ilbc = true
-rtc_build_with_neon = false
+rtc_build_with_neon = true
 rtc_build_examples = false
-# rtc_enable_avx2 = true
+rtc_enable_avx2 = false
 enable_vr = true
 use_vr_assets_component = true
 enable_platform_hevc = true

build_android.sh

@@ -34,19 +34,21 @@ printf "${YEL}Note: You may want ADB installed.${c0}\n" &&
 printf "${CYA}\n" &&
 
 # Workaround for branding dir
-rm -v -r -f $HOME/chromium/src/chrome/android/java/res_base/drawable-v26/ic_launcher.xml &&
-rm -v -r -f $HOME/chromium/src/chrome/android/java/res_base/drawable-v26/ic_launcher_round.xml &&
-rm -v -r -f $HOME/chromium/src/chrome/android/java/res_chromium_base/mipmap-mdpi/layered_app_icon_background.png &&
-rm -v -r -f $HOME/chromium/src/chrome/android/java/res_chromium_base/mipmap-mdpi/layered_app_icon.png &&
-rm -v -r -f $HOME/chromium/src/chrome/android/java/res_chromium_base/mipmap-xhdpi/layered_app_icon_background.png &&
-rm -v -r -f $HOME/chromium/src/chrome/android/java/res_chromium_base/mipmap-xhdpi/layered_app_icon.png &&
-rm -v -r -f $HOME/chromium/src/chrome/android/java/res_chromium_base/mipmap-xxxhdpi/layered_app_icon_background.png &&
-rm -v -r -f $HOME/chromium/src/chrome/android/java/res_chromium_base/mipmap-xxxhdpi/layered_app_icon.png &&
-rm -v -r -f $HOME/chromium/src/chrome/android/java/res_chromium_base/mipmap-nodpi/layered_app_icon_foreground.xml &&
-rm -v -r -f $HOME/chromium/src/chrome/android/java/res_chromium_base/mipmap-hdpi/layered_app_icon_background.png &&
-rm -v -r -f $HOME/chromium/src/chrome/android/java/res_chromium_base/mipmap-hdpi/layered_app_icon.png &&
-rm -v -r -f $HOME/chromium/src/chrome/android/java/res_chromium_base/mipmap-xxhdpi/layered_app_icon_background.png &&
-rm -v -r -f $HOME/chromium/src/chrome/android/java/res_chromium_base/mipmap-xxhdpi/layered_app_icon.png &&
+cd $HOME/chromium/src &&
+rm -v -r -f chrome/android/java/res_base/drawable-v26/ic_launcher.xml &&
+rm -v -r -f chrome/android/java/res_base/drawable-v26/ic_launcher_round.xml &&
+rm -v -r -f chrome/android/java/res_chromium_base/mipmap-mdpi/layered_app_icon_background.png &&
+rm -v -r -f chrome/android/java/res_chromium_base/mipmap-mdpi/layered_app_icon.png &&
+rm -v -r -f chrome/android/java/res_chromium_base/mipmap-xhdpi/layered_app_icon_background.png &&
+rm -v -r -f chrome/android/java/res_chromium_base/mipmap-xhdpi/layered_app_icon.png &&
+rm -v -r -f chrome/android/java/res_chromium_base/mipmap-xxxhdpi/layered_app_icon_background.png &&
+rm -v -r -f chrome/android/java/res_chromium_base/mipmap-xxxhdpi/layered_app_icon.png &&
+rm -v -r -f chrome/android/java/res_chromium_base/mipmap-nodpi/layered_app_icon_foreground.xml &&
+rm -v -r -f chrome/android/java/res_chromium_base/mipmap-hdpi/layered_app_icon_background.png &&
+rm -v -r -f chrome/android/java/res_chromium_base/mipmap-hdpi/layered_app_icon.png &&
+rm -v -r -f chrome/android/java/res_chromium_base/mipmap-xxhdpi/layered_app_icon_background.png &&
+rm -v -r -f chrome/android/java/res_chromium_base/mipmap-xxhdpi/layered_app_icon.png &&
+cd $HOME/thorium &&
 
 buildARM32 () {
 # Build Thorium for ARM32

src/build/config/android/BUILD.gn

@@ -51,9 +51,9 @@ config("compiler") {
 
   if (current_cpu == "arm64") {
     if (arm_control_flow_integrity == "standard") {
-      cflags += [ "-mbranch-protection=standard", "-mfloat-abi=hard", "-march=armv8-a+simd", "-mtune=generic-armv8-a+simd", "-mfpu=neon", ]
+      cflags += [ "-mbranch-protection=standard", "-mfloat-abi=hard", "-march=armv8-a+simd", "-mfpu=neon", ]
     } else if (arm_control_flow_integrity == "pac") {
-      cflags += [ "-mbranch-protection=pac-ret", "-mfloat-abi=hard", "-march=armv8-a+simd", "-mtune=generic-armv8-a+simd", "-mfpu=neon", ]
+      cflags += [ "-mbranch-protection=pac-ret", "-mfloat-abi=hard", "-march=armv8-a+simd", "-mfpu=neon", ]
     }
   }
 

src/build/config/compiler/BUILD.gn

@@ -344,6 +344,11 @@ config("compiler") {
       }
     }
 
+    # 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" &&
         current_os != "zos") {

src/chrome/browser/thorium_flag_entries.h

@@ -20,7 +20,7 @@
     {"force-high-contrast",
      "Enable High Contrast Mode",
      "Enables high contrast mode for all Thorium instances.",
-     kOsDesktop, SINGLE_VALUE_TYPE("force-high-contrast")},
+     kOsAll, SINGLE_VALUE_TYPE("force-high-contrast")},
     {"custom-ntp",
      "Custom New Tab Page",
      "Allows setting a custom URL for the New Tab Page (NTP). Value can be internal (e.g. `about:blank`), external (e.g. `example.com`), or local (e.g. `file:///tmp/startpage.html`). This applies for incognito windows as well when not set to a `chrome://` internal page.",
@@ -40,29 +40,29 @@
     {"webgl-msaa-sample-count",
      "WebGL MSAA Sample Count",
      "Set a default sample count for WebGL if MSAA is enabled on the GPU.",
-     kOsDesktop, MULTI_VALUE_TYPE(kWebglMSAASampleCountChoices)},
+     kOsAll, MULTI_VALUE_TYPE(kWebglMSAASampleCountChoices)},
     {"webgl-antialiasing-mode",
      "WebGL Anti-Aliasing Mode",
      "Set the antialiasing method used for WebGL. (None, Explicit, Implicit)",
-     kOsDesktop, MULTI_VALUE_TYPE(kWebglAntialiasingModeChoices)},
+     kOsAll, MULTI_VALUE_TYPE(kWebglAntialiasingModeChoices)},
     {"gpu-rasterization-msaa-sample-count",
      "Native GPU Rasterization MSAA Sample Count",
      "Set a default sample count for native GPU Rasterization if MSAA is enabled on the GPU.",
-     kOsDesktop, MULTI_VALUE_TYPE(kGpuRasterizationMSAASampleCountChoices)},
+     kOsAll, MULTI_VALUE_TYPE(kGpuRasterizationMSAASampleCountChoices)},
     {"num-raster-threads",
      "Number of Raster Threads",
      "Specify the number of worker threads used to rasterize content.",
-     kOsDesktop, MULTI_VALUE_TYPE(kNumRasterThreadsChoices)},
+     kOsAll, MULTI_VALUE_TYPE(kNumRasterThreadsChoices)},
     {"gpu-no-context-lost",
      "No GPU Context Lost",
      "Inform Thorium's GPU process that a GPU context will not be lost in power saving mode, screen saving mode, etc. "
      "Note that this flag does not ensure that a GPU context will never be lost in any situation, like say, a GPU reset. "
      "Useful for fixing blank or pink screens/videos upon system resume, etc.",
-     kOsDesktop, SINGLE_VALUE_TYPE(switches::kGpuNoContextLost)},
+     kOsAll, SINGLE_VALUE_TYPE(switches::kGpuNoContextLost)},
     {"enable-ui-devtools",
      "Enable Native UI Inspection in DevTools",
      "Enables inspection of native UI elements in devtools. Inspect at `chrome://inspect/#native-ui`",
-     kOsDesktop, SINGLE_VALUE_TYPE(ui_devtools::switches::kEnableUiDevTools)},
+     kOsAll, SINGLE_VALUE_TYPE(ui_devtools::switches::kEnableUiDevTools)},
     {"double-click-close-tab",
      "Double Click to Close Tab",
      "Enables double clicking a tab to close it.",
@@ -70,27 +70,27 @@
     {"show-fps-counter",
      "Show FPS Counter",
      "Draws a heads-up-display showing Frames Per Second as well as GPU memory usage.",
-     kOsDesktop, SINGLE_VALUE_TYPE(cc::switches::kShowFPSCounter)},
+     kOsAll, SINGLE_VALUE_TYPE(cc::switches::kShowFPSCounter)},
     {"disable-webgl2",
      "Disable WebGL 2",
      "Disable WebGL 2. Useful for certain GPU/OS combinations.",
-     kOsDesktop, SINGLE_VALUE_TYPE(switches::kDisableWebGL2)},
+     kOsAll, SINGLE_VALUE_TYPE(switches::kDisableWebGL2)},
     {"enable-local-file-accesses",
      "Enable Local File Accesses",
      "Enable local file accesses. Useful for web development.",
-     kOsDesktop, SINGLE_VALUE_TYPE("enable-local-file-accesses")},
+     kOsAll, SINGLE_VALUE_TYPE("enable-local-file-accesses")},
     {"allow-file-access-from-files",
      "Allow File URI Access from Files",
      "By default, file:// URIs cannot read other file:// URIs. This is an override for web developers who need the old behavior for testing.",
-     kOsDesktop, SINGLE_VALUE_TYPE(switches::kAllowFileAccessFromFiles)},
+     kOsAll, SINGLE_VALUE_TYPE(switches::kAllowFileAccessFromFiles)},
     {"disable-web-security",
      "Disable Web Security",
      "Don't enforce the same-origin policy; meant for website testing only. See `https://web.dev/same-origin-policy/`",
-     kOsDesktop, SINGLE_VALUE_TYPE(switches::kDisableWebSecurity)},
+     kOsAll, SINGLE_VALUE_TYPE(switches::kDisableWebSecurity)},
     {"force-gpu-mem-available-mb",
      "Set GPU Available Memory",
      "Sets the total amount of memory (in MB) that may be allocated for GPU resources.",
-     kOsDesktop, MULTI_VALUE_TYPE(kForceGpuMemAvailableMbChoices)},
+     kOsAll, MULTI_VALUE_TYPE(kForceGpuMemAvailableMbChoices)},
     {"disable-encryption",
      "Disable Encryption",
      "Disable encryption of cookies, passwords, and settings which normally uses a generated machine-specific encryption key. This is used to enable portable user data directories. Enabled for Thorium Portable.",