From 1acb0573600102bd3a7c01f79badcc8d8f1416a9 Mon Sep 17 00:00:00 2001 From: Alexander Frick Date: Mon, 12 Feb 2024 15:39:19 -0600 Subject: [PATCH] update args --- TODO.md | 2 -- args.gn | 2 +- arm/android/android_arm32_args.gn | 2 +- arm/android/android_arm64_args.gn | 2 +- arm/android/android_x64_args.gn | 2 +- arm/android/android_x86_args.gn | 2 +- arm/android/chromium_android_args.gn | 2 +- arm/raspi/raspi_args.gn | 2 +- arm/win_ARM_args.gn | 2 +- infra/DEBUG/debug_args.gn | 2 +- infra/DEBUG/win_debug_args.gn | 2 +- other/AVX2/AVX2_args.gn | 2 +- other/AVX2/win_AVX2_args.gn | 2 +- other/CrOS/cros_args.gn | 2 +- other/Mac/mac_ARM_args.gn | 2 +- other/Mac/mac_args.gn | 2 +- other/SSE2/args_SSE2.gn | 2 +- other/SSE2/win_SSE2_args.gn | 2 +- other/SSE3/args_SSE3.gn | 2 +- other/SSE3/win_SSE3_args.gn | 2 +- setup.sh | 2 +- src/content/test/BUILD.gn | 2 +- thorium-libjxl | 2 +- win_args.gn | 2 +- 24 files changed, 23 insertions(+), 25 deletions(-) diff --git a/TODO.md b/TODO.md index f4ee9553..5b98691f 100644 --- a/TODO.md +++ b/TODO.md @@ -38,5 +38,3 @@ Thorium Remote Desktop > Chrome Remote Desktop ThoriumOS Flex > ThoriumOS made possible by Thorium > Chromium Experiments > Thorium Experiments - - - Add https://github.com/ungoogled-software/ungoogled-chromium/blob/master/patches/core/ungoogled-chromium/disable-privacy-sandbox.patch diff --git a/args.gn b/args.gn index ec15cb2c..51b75756 100644 --- a/args.gn +++ b/args.gn @@ -54,7 +54,7 @@ ffmpeg_branding = "Chrome" clang_use_chrome_plugins = true enable_ffmpeg_video_decoders = true is_component_ffmpeg = true -use_webaudio_ffmpeg = false +# use_webaudio_ffmpeg = false use_webaudio_pffft = true # enable_av1_decoder = true # enable_dav1d_decoder = true diff --git a/arm/android/android_arm32_args.gn b/arm/android/android_arm32_args.gn index f61f00e8..a47caace 100644 --- a/arm/android/android_arm32_args.gn +++ b/arm/android/android_arm32_args.gn @@ -71,7 +71,7 @@ ffmpeg_branding = "Chrome" clang_use_chrome_plugins = true enable_ffmpeg_video_decoders = true is_component_ffmpeg = false -use_webaudio_ffmpeg = false +# use_webaudio_ffmpeg = false use_webaudio_pffft = true # enable_av1_decoder = true # enable_dav1d_decoder = true diff --git a/arm/android/android_arm64_args.gn b/arm/android/android_arm64_args.gn index ca34714e..b78f1e03 100644 --- a/arm/android/android_arm64_args.gn +++ b/arm/android/android_arm64_args.gn @@ -71,7 +71,7 @@ ffmpeg_branding = "Chrome" clang_use_chrome_plugins = true enable_ffmpeg_video_decoders = true is_component_ffmpeg = false -use_webaudio_ffmpeg = false +# use_webaudio_ffmpeg = false use_webaudio_pffft = true # enable_av1_decoder = true # enable_dav1d_decoder = true diff --git a/arm/android/android_x64_args.gn b/arm/android/android_x64_args.gn index 42f0ae3c..125bae59 100644 --- a/arm/android/android_x64_args.gn +++ b/arm/android/android_x64_args.gn @@ -61,7 +61,7 @@ ffmpeg_branding = "Chrome" clang_use_chrome_plugins = true enable_ffmpeg_video_decoders = true is_component_ffmpeg = false -use_webaudio_ffmpeg = false +# use_webaudio_ffmpeg = false use_webaudio_pffft = true # enable_av1_decoder = true # enable_dav1d_decoder = true diff --git a/arm/android/android_x86_args.gn b/arm/android/android_x86_args.gn index d757de70..6fce6b83 100644 --- a/arm/android/android_x86_args.gn +++ b/arm/android/android_x86_args.gn @@ -61,7 +61,7 @@ ffmpeg_branding = "Chrome" clang_use_chrome_plugins = true enable_ffmpeg_video_decoders = true is_component_ffmpeg = false -use_webaudio_ffmpeg = false +# use_webaudio_ffmpeg = false use_webaudio_pffft = true # enable_av1_decoder = true # enable_dav1d_decoder = true diff --git a/arm/android/chromium_android_args.gn b/arm/android/chromium_android_args.gn index f416d77f..b393ce15 100644 --- a/arm/android/chromium_android_args.gn +++ b/arm/android/chromium_android_args.gn @@ -62,7 +62,7 @@ ffmpeg_branding = "Chrome" clang_use_chrome_plugins = true enable_ffmpeg_video_decoders = true is_component_ffmpeg = false -use_webaudio_ffmpeg = false +# use_webaudio_ffmpeg = false use_webaudio_pffft = true # enable_av1_decoder = true # enable_dav1d_decoder = true diff --git a/arm/raspi/raspi_args.gn b/arm/raspi/raspi_args.gn index 6ddea819..2f762a51 100644 --- a/arm/raspi/raspi_args.gn +++ b/arm/raspi/raspi_args.gn @@ -64,7 +64,7 @@ ffmpeg_branding = "Chrome" clang_use_chrome_plugins = true enable_ffmpeg_video_decoders = true is_component_ffmpeg = true -use_webaudio_ffmpeg = false +# use_webaudio_ffmpeg = false use_webaudio_pffft = true # enable_av1_decoder = true # enable_dav1d_decoder = true diff --git a/arm/win_ARM_args.gn b/arm/win_ARM_args.gn index 3a1ff953..9fa34ad7 100644 --- a/arm/win_ARM_args.gn +++ b/arm/win_ARM_args.gn @@ -53,7 +53,7 @@ ffmpeg_branding = "Chrome" clang_use_chrome_plugins = true enable_ffmpeg_video_decoders = true is_component_ffmpeg = false -use_webaudio_ffmpeg = false +# use_webaudio_ffmpeg = false use_webaudio_pffft = true # enable_av1_decoder = true # enable_dav1d_decoder = true diff --git a/infra/DEBUG/debug_args.gn b/infra/DEBUG/debug_args.gn index 4edddc86..3deac83f 100644 --- a/infra/DEBUG/debug_args.gn +++ b/infra/DEBUG/debug_args.gn @@ -52,7 +52,7 @@ ffmpeg_branding = "Chrome" clang_use_chrome_plugins = true enable_ffmpeg_video_decoders = true is_component_ffmpeg = true -use_webaudio_ffmpeg = false +# use_webaudio_ffmpeg = false use_webaudio_pffft = true # enable_av1_decoder = true # enable_dav1d_decoder = true diff --git a/infra/DEBUG/win_debug_args.gn b/infra/DEBUG/win_debug_args.gn index 66e1d7a7..bcac5f45 100644 --- a/infra/DEBUG/win_debug_args.gn +++ b/infra/DEBUG/win_debug_args.gn @@ -49,7 +49,7 @@ ffmpeg_branding = "Chrome" clang_use_chrome_plugins = true enable_ffmpeg_video_decoders = true is_component_ffmpeg = true -use_webaudio_ffmpeg = false +# use_webaudio_ffmpeg = false use_webaudio_pffft = true # enable_av1_decoder = true # enable_dav1d_decoder = true diff --git a/other/AVX2/AVX2_args.gn b/other/AVX2/AVX2_args.gn index ec15cb2c..51b75756 100644 --- a/other/AVX2/AVX2_args.gn +++ b/other/AVX2/AVX2_args.gn @@ -54,7 +54,7 @@ ffmpeg_branding = "Chrome" clang_use_chrome_plugins = true enable_ffmpeg_video_decoders = true is_component_ffmpeg = true -use_webaudio_ffmpeg = false +# use_webaudio_ffmpeg = false use_webaudio_pffft = true # enable_av1_decoder = true # enable_dav1d_decoder = true diff --git a/other/AVX2/win_AVX2_args.gn b/other/AVX2/win_AVX2_args.gn index b30522df..e7d7e504 100644 --- a/other/AVX2/win_AVX2_args.gn +++ b/other/AVX2/win_AVX2_args.gn @@ -51,7 +51,7 @@ ffmpeg_branding = "Chrome" clang_use_chrome_plugins = true enable_ffmpeg_video_decoders = true is_component_ffmpeg = true -use_webaudio_ffmpeg = false +# use_webaudio_ffmpeg = false use_webaudio_pffft = true # enable_av1_decoder = true # enable_dav1d_decoder = true diff --git a/other/CrOS/cros_args.gn b/other/CrOS/cros_args.gn index e5350aa7..1ea3da07 100644 --- a/other/CrOS/cros_args.gn +++ b/other/CrOS/cros_args.gn @@ -53,7 +53,7 @@ ffmpeg_branding = "Chrome" clang_use_chrome_plugins = true enable_ffmpeg_video_decoders = true is_component_ffmpeg = true -use_webaudio_ffmpeg = false +# use_webaudio_ffmpeg = false use_webaudio_pffft = true # enable_av1_decoder = true # enable_dav1d_decoder = true diff --git a/other/Mac/mac_ARM_args.gn b/other/Mac/mac_ARM_args.gn index 00f22908..1dbdff5d 100644 --- a/other/Mac/mac_ARM_args.gn +++ b/other/Mac/mac_ARM_args.gn @@ -51,7 +51,7 @@ ffmpeg_branding = "Chrome" # clang_use_chrome_plugins = true enable_ffmpeg_video_decoders = true is_component_ffmpeg = false -use_webaudio_ffmpeg = false +# use_webaudio_ffmpeg = false use_webaudio_pffft = true # enable_av1_decoder = true # enable_dav1d_decoder = true diff --git a/other/Mac/mac_args.gn b/other/Mac/mac_args.gn index a2418c95..9ae7cacf 100644 --- a/other/Mac/mac_args.gn +++ b/other/Mac/mac_args.gn @@ -53,7 +53,7 @@ ffmpeg_branding = "Chrome" clang_use_chrome_plugins = true enable_ffmpeg_video_decoders = true is_component_ffmpeg = false -use_webaudio_ffmpeg = false +# use_webaudio_ffmpeg = false use_webaudio_pffft = false # enable_av1_decoder = true # enable_dav1d_decoder = true diff --git a/other/SSE2/args_SSE2.gn b/other/SSE2/args_SSE2.gn index 7480c4fa..e9abae46 100644 --- a/other/SSE2/args_SSE2.gn +++ b/other/SSE2/args_SSE2.gn @@ -54,7 +54,7 @@ ffmpeg_branding = "Chrome" clang_use_chrome_plugins = true enable_ffmpeg_video_decoders = true is_component_ffmpeg = true -use_webaudio_ffmpeg = false +# use_webaudio_ffmpeg = false use_webaudio_pffft = true # enable_av1_decoder = true # enable_dav1d_decoder = true diff --git a/other/SSE2/win_SSE2_args.gn b/other/SSE2/win_SSE2_args.gn index 110e895d..133bb3d6 100644 --- a/other/SSE2/win_SSE2_args.gn +++ b/other/SSE2/win_SSE2_args.gn @@ -52,7 +52,7 @@ ffmpeg_branding = "Chrome" clang_use_chrome_plugins = true enable_ffmpeg_video_decoders = true is_component_ffmpeg = true -use_webaudio_ffmpeg = false +# use_webaudio_ffmpeg = false use_webaudio_pffft = true # enable_av1_decoder = true # enable_dav1d_decoder = true diff --git a/other/SSE3/args_SSE3.gn b/other/SSE3/args_SSE3.gn index 1c388a8b..f0efb4b8 100644 --- a/other/SSE3/args_SSE3.gn +++ b/other/SSE3/args_SSE3.gn @@ -54,7 +54,7 @@ ffmpeg_branding = "Chrome" clang_use_chrome_plugins = true enable_ffmpeg_video_decoders = true is_component_ffmpeg = true -use_webaudio_ffmpeg = false +# use_webaudio_ffmpeg = false use_webaudio_pffft = true # enable_av1_decoder = true # enable_dav1d_decoder = true diff --git a/other/SSE3/win_SSE3_args.gn b/other/SSE3/win_SSE3_args.gn index 7ffce127..a9fa4940 100644 --- a/other/SSE3/win_SSE3_args.gn +++ b/other/SSE3/win_SSE3_args.gn @@ -51,7 +51,7 @@ ffmpeg_branding = "Chrome" clang_use_chrome_plugins = true enable_ffmpeg_video_decoders = true is_component_ffmpeg = true -use_webaudio_ffmpeg = false +# use_webaudio_ffmpeg = false use_webaudio_pffft = true # enable_av1_decoder = true # enable_dav1d_decoder = true diff --git a/setup.sh b/setup.sh index 9067417f..d49d6b27 100755 --- a/setup.sh +++ b/setup.sh @@ -169,7 +169,7 @@ copyAndroid () { cp -r -v arm/build/config/* ${CR_SRC_DIR}/build/config/ && cp -r -v arm/media/* ${CR_SRC_DIR}/media/ && cp -r -v arm/android/* ${CR_SRC_DIR}/ && - cp -r -v arm/android/third_party/* ${CR_SRC_DIR}/third_party/ && + #cp -r -v arm/android/third_party/* ${CR_SRC_DIR}/third_party/ && cp -r -v arm/third_party/* ${CR_SRC_DIR}/third_party/ && rm -v -r -f ${CR_SRC_DIR}/chrome/android/java/res_base/drawable-v26/ic_launcher.xml && rm -v -r -f ${CR_SRC_DIR}/chrome/android/java/res_base/drawable-v26/ic_launcher_round.xml && diff --git a/src/content/test/BUILD.gn b/src/content/test/BUILD.gn index ee209b2c..61f47a60 100644 --- a/src/content/test/BUILD.gn +++ b/src/content/test/BUILD.gn @@ -2152,7 +2152,7 @@ test("content_browsertests") { "//mojo/public/mojom/base", ] data_deps += [ - "//content/shell:content_shell", + "//content/shell:thorium_shell", "//mojo/core:shared_library", ] if (use_ozone) { diff --git a/thorium-libjxl b/thorium-libjxl index 633dc422..8492bf1e 160000 --- a/thorium-libjxl +++ b/thorium-libjxl @@ -1 +1 @@ -Subproject commit 633dc42251bfc34a862e146975acceb6e474f98f +Subproject commit 8492bf1e7a96b544683592bb54eeb844f404c439 diff --git a/win_args.gn b/win_args.gn index b30522df..e7d7e504 100644 --- a/win_args.gn +++ b/win_args.gn @@ -51,7 +51,7 @@ ffmpeg_branding = "Chrome" clang_use_chrome_plugins = true enable_ffmpeg_video_decoders = true is_component_ffmpeg = true -use_webaudio_ffmpeg = false +# use_webaudio_ffmpeg = false use_webaudio_pffft = true # enable_av1_decoder = true # enable_dav1d_decoder = true