diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 270fec48ce716374984ca083e201295cd3eadc65..4a53ae16099e78a0ac6040cf0b29a4de8f5b704d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -51,6 +51,21 @@ build-cromite-x64: script: - $CI_PROJECT_DIR/build.sh -c -s -a x64 +archive-filter: + stage: build + image: registry.gitlab.e.foundation/e/os/docker-android-apps-cicd:slim-latest + rules: + - if: $CI_PIPELINE_SOURCE != "schedule" + needs: + - job: build-cromite-x64 + script: + - "true" + artifacts: + name: "$CI_JOB_NAME" + paths: + - bin/* + expire_in: 30 days + .build-filters: image: registry.gitlab.e.foundation/e/os/docker-android-apps-cicd:slim-latest stage: filters diff --git a/build/cromite b/build/cromite index 8e844cf64f8159a72f158eb33e2f09b19f7d115a..c713b95df68b610712e04a58fb7a7d6a39d355d2 160000 --- a/build/cromite +++ b/build/cromite @@ -1 +1 @@ -Subproject commit 8e844cf64f8159a72f158eb33e2f09b19f7d115a +Subproject commit c713b95df68b610712e04a58fb7a7d6a39d355d2 diff --git a/build/e_patches/Disable-AGSA-by-default.patch b/build/e_patches/Disable-AGSA-by-default.patch index 46f989739059bfc93f9de6ff625e1cbd0afd9d90..566f70fa7236c4e250c2c0441feffe1edce07c53 100644 --- a/build/e_patches/Disable-AGSA-by-default.patch +++ b/build/e_patches/Disable-AGSA-by-default.patch @@ -1,4 +1,4 @@ -From fb8e209a35d3dfc9768dca12acf8368d2a4a9e7d Mon Sep 17 00:00:00 2001 +From 2b645ba40de7d7ca547624fb256f1db87803c0d5 Mon Sep 17 00:00:00 2001 From: csagan5 <32685696+csagan5@users.noreply.github.com> Date: Sun, 26 Sep 2021 11:17:53 +0200 Subject: Disable AGSA by default @@ -217,10 +217,10 @@ index 7750e00806bc2..dd2b2f40f8043 100644 if (DomDistillerFeatures.sReaderModeDistillInApp.isEnabled()) { mReaderModeBottomSheetManager = diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc -index 2bf15fa317831..88030d6b1ea98 100644 +index 810419309b6a3..cc95f4dbc626d 100644 --- a/chrome/browser/flags/android/chrome_feature_list.cc +++ b/chrome/browser/flags/android/chrome_feature_list.cc -@@ -688,7 +688,7 @@ BASE_FEATURE(kEducationalTipDefaultBrowserPromoCard, base::FEATURE_DISABLED_BY_D +@@ -687,7 +687,7 @@ BASE_FEATURE(kEducationalTipDefaultBrowserPromoCard, base::FEATURE_DISABLED_BY_D BASE_FEATURE(kEmptyTabListAnimationKillSwitch, base::FEATURE_ENABLED_BY_DEFAULT); BASE_FEATURE(kEnableEscapeHandlingForSecondaryActivities, base::FEATURE_DISABLED_BY_DEFAULT); BASE_FEATURE(kEnableXAxisActivityTransition, base::FEATURE_DISABLED_BY_DEFAULT); @@ -230,5 +230,5 @@ index 2bf15fa317831..88030d6b1ea98 100644 BASE_FEATURE(kForceTranslucentNotificationTrampoline, base::FEATURE_DISABLED_BY_DEFAULT); BASE_FEATURE(kFullscreenInsetsApiMigration, base::FEATURE_DISABLED_BY_DEFAULT); -- -2.51.2 +2.52.0 diff --git a/build/e_patches/Enable-JIT-by-default.patch b/build/e_patches/Enable-JIT-by-default.patch new file mode 100644 index 0000000000000000000000000000000000000000..bd8c8b336fe428feb7bc6a4eb0bffa96ece0d1be --- /dev/null +++ b/build/e_patches/Enable-JIT-by-default.patch @@ -0,0 +1,25 @@ +From 6670d4b258d3a80640af846cd429851948798c72 Mon Sep 17 00:00:00 2001 +From: Nishith Khanna +Date: Tue, 13 Jan 2026 12:51:28 +0000 +Subject: Enable JIT by default + +--- + .../content_settings/core/browser/content_settings_registry.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc +index a881ba1743f4b..b482c28f03e72 100644 +--- a/components/content_settings/core/browser/content_settings_registry.cc ++++ b/components/content_settings/core/browser/content_settings_registry.cc +@@ -589,7 +589,7 @@ void ContentSettingsRegistry::Init() { + PermissionSettingsInfo::EXCEPTIONS_ON_SECURE_ORIGINS_ONLY); + + Register(ContentSettingsType::JAVASCRIPT_JIT, "javascript-jit", +- CONTENT_SETTING_BLOCK, WebsiteSettingsInfo::UNSYNCABLE, ++ CONTENT_SETTING_ALLOW, WebsiteSettingsInfo::UNSYNCABLE, + /*allowlisted_primary_schemes=*/{}, + /*valid_settings=*/{CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK}, + WebsiteSettingsInfo::TOP_ORIGIN_ONLY_SCOPE, +-- +2.51.2 + diff --git a/build/e_patches/Multiple-fingerprinting-mitigations.patch b/build/e_patches/Multiple-fingerprinting-mitigations.patch index 06e60449e4ca2fc56064807a3e2b66c923d922e3..1c2a37730b578689d82fa94242c0d6d0499ffa9f 100644 --- a/build/e_patches/Multiple-fingerprinting-mitigations.patch +++ b/build/e_patches/Multiple-fingerprinting-mitigations.patch @@ -1,4 +1,4 @@ -From f870bb9c61a0b331d1cfc912b780a984ea7bdead Mon Sep 17 00:00:00 2001 +From 5eeebcb98cec6a5a146206087394dee0e17009ed Mon Sep 17 00:00:00 2001 From: csagan5 <32685696+csagan5@users.noreply.github.com> Date: Fri, 30 Mar 2018 10:09:03 +0200 Subject: Multiple fingerprinting mitigations @@ -66,7 +66,7 @@ index f5acf46010e85..fa4efe2e957d6 100644 "//services/device/public/mojom:usb", "//services/image_annotation:service", diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc -index abd4cb89bda91..d7a872992568a 100644 +index 0ef29706d8144..ef0d82f5e97e1 100644 --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc @@ -268,6 +268,8 @@ @@ -700,7 +700,7 @@ index 3569ab7ee695e..41ce0df8031e6 100644 // Methods overridden by all sub-classes diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5 -index ea8a8afdbf8c8..fa5ef2a3da35f 100644 +index 59e4a9618b092..61c0e41e59bcf 100644 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5 @@ -3467,6 +3467,12 @@ @@ -777,5 +777,5 @@ index 0000000000000..f1db5dba46d93 + +#endif // THIRD_PARTY_UNGOOGLED_FINGERPRINTING_SWITCHES_H_ -- -2.51.2 +2.52.0 diff --git a/build/e_patches/Reintroduce-kWebAuthCable.patch b/build/e_patches/Reintroduce-kWebAuthCable.patch index 3770b0d31470465e1c730a98036beee23f6e8615..f7c83d399116825b66870eb6bfc0a112941a2415 100644 --- a/build/e_patches/Reintroduce-kWebAuthCable.patch +++ b/build/e_patches/Reintroduce-kWebAuthCable.patch @@ -1,4 +1,4 @@ -From 2e494ae5f21cc281d11ae5f101f920d93f286853 Mon Sep 17 00:00:00 2001 +From 959353c54729d6dac9f24e302dcb86b1f61dac1c Mon Sep 17 00:00:00 2001 From: csagan5 <32685696+csagan5@users.noreply.github.com> Date: Sun, 4 Sep 2022 18:47:58 +0200 Subject: Re-introduce kWebAuthCable @@ -107,7 +107,7 @@ index 5434e5a8ad746..bc43eb7f1d07d 100644 NavigateAndCommit(GURL(kTestOrigin1)); diff --git a/content/public/common/content_features.cc b/content/public/common/content_features.cc -index 0b5c77000bc48..cc61a94baad9b 100644 +index 238e40f92e8d3..fc744c7424dd8 100644 --- a/content/public/common/content_features.cc +++ b/content/public/common/content_features.cc @@ -1177,6 +1177,13 @@ BASE_FEATURE(kWebAssemblyTrapHandler, @@ -137,5 +137,5 @@ index 9fc7165a6fb53..3c58c0d548c2b 100644 CONTENT_EXPORT BASE_DECLARE_FEATURE(kWebBluetoothNewPermissionsBackend); CONTENT_EXPORT BASE_DECLARE_FEATURE(kWebOtpBackendAuto); -- -2.51.2 +2.52.0 diff --git a/build/e_patches/Update-i18n-zhCN-support.patch b/build/e_patches/Update-i18n-zhCN-support.patch index 27ea6a9ada0b2447c4e18c7df593642a2e6e8e80..fe89e50da8f6265a751ed9f90e37de67cee5c96c 100644 --- a/build/e_patches/Update-i18n-zhCN-support.patch +++ b/build/e_patches/Update-i18n-zhCN-support.patch @@ -1,4 +1,4 @@ -From c09a24e858539864ed5af3149038c1e062bddced Mon Sep 17 00:00:00 2001 +From 566d393d14dc81223488af89238cca9fdca1dc2b Mon Sep 17 00:00:00 2001 From: mars Date: Sun, 2 Aug 2020 00:37:49 +0800 Subject: Update i18n zh_CN support @@ -15,7 +15,7 @@ Signed-off-by: Saalim Quadri 6 files changed, 133 insertions(+), 6 deletions(-) diff --git a/chrome/app/resources/generated_resources_zh-CN.xtb b/chrome/app/resources/generated_resources_zh-CN.xtb -index 0022079448447..370577ca2cdaf 100644 +index e00d8495259eb..586cd851df883 100644 --- a/chrome/app/resources/generated_resources_zh-CN.xtb +++ b/chrome/app/resources/generated_resources_zh-CN.xtb @@ -12016,4 +12016,6 @@ @@ -28,7 +28,7 @@ index 0022079448447..370577ca2cdaf 100644 +配置广告拦截和过滤规则地址 + diff --git a/chrome/app/resources/google_chrome_strings_zh-CN.xtb b/chrome/app/resources/google_chrome_strings_zh-CN.xtb -index 38ca3808f8e97..4b60c2671481d 100644 +index 1763585390619..6faacb9a60066 100644 --- a/chrome/app/resources/google_chrome_strings_zh-CN.xtb +++ b/chrome/app/resources/google_chrome_strings_zh-CN.xtb @@ -732,4 +732,5 @@ @@ -40,7 +40,7 @@ index 38ca3808f8e97..4b60c2671481d 100644 +关于 Bromite + diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_zh-CN.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_zh-CN.xtb -index 11dc8f1b688fc..4b9d44e4c9fbd 100644 +index d8f395c6ea999..f4c1e3cc973bd 100644 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_zh-CN.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_zh-CN.xtb @@ -1951,4 +1951,74 @@ @@ -121,7 +121,7 @@ index 11dc8f1b688fc..4b9d44e4c9fbd 100644 +全选 + diff --git a/components/browser_ui/strings/android/translations/browser_ui_strings_zh-CN.xtb b/components/browser_ui/strings/android/translations/browser_ui_strings_zh-CN.xtb -index 2d3d49e2751aa..72ac1318dda5d 100644 +index b8dba7b5e9536..00e77c71f4f5c 100644 --- a/components/browser_ui/strings/android/translations/browser_ui_strings_zh-CN.xtb +++ b/components/browser_ui/strings/android/translations/browser_ui_strings_zh-CN.xtb @@ -744,4 +744,28 @@ @@ -156,10 +156,10 @@ index 2d3d49e2751aa..72ac1318dda5d 100644 +WebRTC + diff --git a/components/strings/components_strings_zh-CN.xtb b/components/strings/components_strings_zh-CN.xtb -index c156e0b6ad491..6fda96ec098af 100644 +index 4d3e49bea0798..b5af04e236b72 100644 --- a/components/strings/components_strings_zh-CN.xtb +++ b/components/strings/components_strings_zh-CN.xtb -@@ -5069,4 +5069,33 @@ +@@ -5068,4 +5068,33 @@ 添加 IBAN YouTube 来自 Google Pay @@ -208,5 +208,5 @@ index 5259e751b21cd..44cc7f0f184cd 100644 +无法保存到所选文件 + -- -2.51.2 +2.52.0 diff --git a/build/e_patches_list.txt b/build/e_patches_list.txt index 8a5f5033d0ea5ad03d215634a20c0b392e32729e..a47632ae7de161f4063721d3643c80506afbf076 100644 --- a/build/e_patches_list.txt +++ b/build/e_patches_list.txt @@ -66,3 +66,4 @@ Browser-Move-to-Murena-Qwant-from-QwanteSpot.patch Browser-Check-for-webapk-and-system-signature.patch Browser-Add-support-for-eOS-webapk.patch Enable-zoom-option-in-main-menu-by-default.patch +Enable-JIT-by-default.patch diff --git a/generate_filters.sh b/generate_filters.sh index 01510896f26b94a9ba6e75055e2f1c54ea334a51..a6491e1708cbfef25cb8e07796587a82290d736e 100755 --- a/generate_filters.sh +++ b/generate_filters.sh @@ -23,13 +23,13 @@ if [ -z "$selected_tag" ]; then exit 1 fi -echo "Looking for build-cromite-x64 job in pipeline $pipeline_id..." +echo "Looking for archive-filter job in pipeline $pipeline_id..." job_id=$(curl -s "${GITLAB_API}/projects/${PROJECT_PATH}/pipelines/${pipeline_id}/jobs" | - jq -r '.[] | select(.name=="build-cromite-x64") | .id') + jq -r '.[] | select(.name=="archive-filter") | .id') if [ -z "$job_id" ]; then - echo "No job named build-cromite-x64 found in pipeline $pipeline_id" + echo "No job named archive-filter found in pipeline $pipeline_id" exit 1 fi diff --git a/versions.txt b/versions.txt index 4c3e210b6f7a0a8fb9d722891ba0156188d56c52..d85e8316c34b5f6e9ae8b92b0a5eb9428770d3c5 100644 --- a/versions.txt +++ b/versions.txt @@ -1,3 +1,3 @@ -chromium_version="143.0.7499.109" -cromite_branch="v143.0.7499.110-8e844cf64f8159a72f158eb33e2f09b19f7d115a" -ungoogled_chromium_branch="143.0.7499.109-1" +chromium_version="143.0.7499.192" +cromite_branch="master" +ungoogled_chromium_branch="143.0.7499.192-1"