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: I0130d41e4236934f692b18205734b4d2ea58238e
Signed-off-by: Manjeet <manjeet.1@partner.samsung.com>

diff --git a/tools/grit/grit_args.gni b/tools/grit/grit_args.gni
index 52f0fc597d06e338df8a7a91912aec8c70ef12a9..c91c8ef9732a41473df2789e0fcb9c79d65e091c 100644 (file)
--- a/tools/grit/grit_args.gni
+++ b/tools/grit/grit_args.gni
@@ -33,6 +33,7 @@ _grit_defines = [
   "toolkit_views=${toolkit_views}",
   "use_aura=${use_aura}",
   "use_ozone=${use_ozone}",
+  "is_tizen=${is_tizen}",
 
   # Mac and iOS want Title Case strings.
   "use_titlecase=${is_apple}",

diff --git a/tools/grit/grit_rule.gni b/tools/grit/grit_rule.gni
index f0e7fdf8e3a1382b76424ded5949b27e8a96a86f..7956feba8bc2cc2a62e44dc4b03eab258ff1cf92 100644 (file)
--- 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) {