From c09468bc5ebed5fa425afc35ab46bfe6dc969f80 Mon Sep 17 00:00:00 2001 From: Manjeet Date: Thu, 21 Mar 2024 21:28:09 +0530 Subject: [PATCH] fixup! [M120 Migration] Languages pak optimization This patch fixes the AssertionError[1] which occurs while desktop build. [1] undefined Grit variable found: is_tizen Reference: https://review.tizen.org/gerrit/291547 Change-Id: I18eda849a0f4a0f5712d082d5f42ad6c85b0d125 Signed-off-by: Manjeet --- tools/grit/grit_rule.gni | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/tools/grit/grit_rule.gni b/tools/grit/grit_rule.gni index f0e7fdf8e3a1..7956feba8bc2 100644 --- a/tools/grit/grit_rule.gni +++ b/tools/grit/grit_rule.gni @@ -96,7 +96,6 @@ import("//tools/grit/grit_args.gni") _strip_resource_files = is_android && is_official_build _js_minifier = "//tools/grit/minify_js.py" _css_minifier = "//tools/grit/minimize_css.py" -grit_defines = [] grit_resource_id_target = "//tools/gritsettings:default_resource_ids" grit_resource_id_file = @@ -115,13 +114,6 @@ if (is_win) { "//tools/gritsettings/startup_resources_win.txt" } -if (is_tizen) { - grit_defines += [ - "-D", - "is_tizen", - ] -} - template("grit") { if (defined(invoker.output_dir)) { _output_dir = invoker.output_dir @@ -202,7 +194,7 @@ template("grit") { rebase_path(depfile, root_build_dir), "--write-only-new=1", "--depend-on-stamp", - ] + _grit_flags + grit_defines + ] + _grit_flags # Add brotli executable if using brotli. if (defined(invoker.use_brotli) && invoker.use_brotli) { -- 2.34.1