From 939d799d7a0c35055948d875bc5162c02490df34 Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Sun, 30 Mar 2025 07:12:43 +0100 Subject: [PATCH] [cr136] `js_minifier_ignore_list` gone from grit's minifier As the override in place is trying to prevent minifying a file, the exclusion now is to just return the contents that were received untouched. Chromium changes: https://chromium.googlesource.com/chromium/src/+/eadc4393a867edd65f8c279732e16cc631e30005 commit eadc4393a867edd65f8c279732e16cc631e30005 Author: dpapad Date: Tue Mar 4 12:24:49 2025 -0800 WebUI: Remove JS minification step built into Grit on Android builds. JS minification happens within build_webui() targets, and does not belong in Grit. It was added there long time ago, before build_webui() existed and before any other minification happened during the build. Removing it avoids running the minifier (Terser) on top of already minified files, reducing unnecessary work during the build, as well as complexity when minification needs to be turned off for specific files. Fixed: 340278433 Change-Id: I7148bba2e542860ffafc5394e393614a6b377918 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6158805 Reviewed-by: Andrew Grieve Auto-Submit: Demetrios Papadopoulos Commit-Queue: Demetrios Papadopoulos Commit-Queue: Andrew Grieve Cr-Commit-Position: refs/heads/main@{#1427910} --- chromium_src/tools/grit/grit/format/minifier.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/chromium_src/tools/grit/grit/format/minifier.py b/chromium_src/tools/grit/grit/format/minifier.py index de4ff26b739..728db540bcd 100644 --- a/chromium_src/tools/grit/grit/format/minifier.py +++ b/chromium_src/tools/grit/grit/format/minifier.py @@ -8,7 +8,6 @@ import override_utils @override_utils.override_function(globals()) def Minify(original_function, source, filename): - with override_utils.override_scope_variable( - globals(), 'js_minifier_ignore_list', - js_minifier_ignore_list + ['gen/brave/web-ui-opaque_ke/']): - return original_function(source, filename) + if 'gen/brave/web-ui-opaque_ke/' in filename: + return source + return original_function(source, filename)