[Chromecast] Remove chromecast_repack_locales.py.

chromecast/BUILD.gn

 # Copyright 2015 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//build/buildflag_header.gni")
 import("//build/config/features.gni")
 import("//build/config/locales.gni")
 import("//build/config/sanitizers/sanitizers.gni")
 import("//build/config/ui.gni")
 import("//chromecast/build/tests/cast_test.gni")
@@ skipping 391 matching lines @@
     "//ui/strings",
   ]
 
   if (chromecast_branding != "public") {
     sources += [ "$root_gen_dir/chromecast/internal/cast_shell_internal.pak" ]
 
     deps += [ "//chromecast/internal:cast_shell_internal_pak" ]
   }
 }
 
-action("chromecast_locales_pak") {
-  script = "//chromecast/tools/build/chromecast_repack_locales.py"
+template("cast_repack_locales") {
+  output_dir = invoker.output_dir
 
-  # .pak resources in |grit_out_dir| with the same suffix are packed into a
-  # single resource and placed in |locales_dir|. The original .pak resources
-  # are generated by this target's dependencies.
-  grit_out_dir = "$root_gen_dir/chromecast_strings"
-  locales_dir = "$root_out_dir/chromecast_locales"
+  # |locales| is an array of suffixes declared in //build/config/locales.gni.
+  foreach(locale, locales) {
+    repack("_cast_repack_${locale}") {
+      output = "${output_dir}/${locale}.pak"
+      sources = [
+        "$root_gen_dir/chromecast/app/chromecast_settings_${locale}.pak",
+      ]
+      deps = [
+        "//chromecast/app:chromecast_settings",
+      ]
 
-  sources = []
-  outputs = []
+      if (chromecast_branding != "public") {
+        sources +=
+            [ "$root_gen_dir/chromecast_strings/app_strings_${locale}.pak" ]

[mbjorge, 2017/03/22 21:26:33]

Any benefit in moving the webui strings to output to the default directory also,
instead of /chromecast_strings?

[slan, 2017/03/22 22:54:52]

Yeah, ok... Will need a corresponding internal change. Done.

+        deps += [ "//chromecast/internal/webui:chromecast_app_strings" ]
 
-  # |locales| is an array of suffixes declared in //build/config/locals.gni.
-  foreach(locale, locales) {
-    sources += [ "$grit_out_dir/chromecast_settings_$locale.pak" ]
-    outputs += [ "$locales_dir/$locale.pak" ]
-  }
-  deps = [
-    "//chromecast/app:chromecast_settings",
-  ]
-
-  # Include string and other localized resources for internal builds.
-  if (chromecast_branding != "public") {
-    foreach(locale, locales) {
-      sources += [ "$grit_out_dir/app_strings_$locale.pak" ]
-      if (enable_chromecast_webui) {
-        sources += [ "$grit_out_dir/webui_localized_$locale.pak" ]
+        if (enable_chromecast_webui) {
+          sources += [ "$root_gen_dir/chromecast_strings/webui_localized_${locale}.pak" ]
+          deps += [ "//chromecast/internal/webui:chromecast_webui_localized" ]
+        }
       }
     }
-    deps += [ "//chromecast/internal/webui:chromecast_app_strings" ]
-    if (enable_chromecast_webui) {
-      deps += [ "//chromecast/internal/webui:chromecast_webui_localized" ]
-    }
   }
 
-  # This script only accepts the following values for branding:
-  assert(chromecast_branding == "public" || chromecast_branding == "internal" ||
-         chromecast_branding == "google")
-  args = [
-    "-b",
-    "$chromecast_branding",
-    "-g",
-    rebase_path("$root_gen_dir/chromecast_strings"),
-    "-x",
-    rebase_path("$root_out_dir/chromecast_locales"),
-  ]
-  if (enable_chromecast_webui) {
-    args += [ "-u" ]
+  group(target_name) {
+    deps = []
+    foreach(locale, locales) {
+      deps += [ ":_cast_repack_${locale}" ]
+    }
   }
-  args += locales
+}
+
+cast_repack_locales("chromecast_locales_pak") {

[mbjorge, 2017/03/22 21:26:33]

Is the template actually necessary?

Could you just have:

foreach(locale, locales) {
  repack("_cast_repack_${locale}") {
     output = "$root_out_dir/chromecast_locales/${locale}.pak"
     sources = ...
     ...
  }
}

group("chromecast_locales_pak") {
  foreach(locale, locales) {
     deps += [ ":_cast_repack_${locale}" ]
  }
}

[slan, 2017/03/22 22:54:52]

Yes, I can. I think it's cleaner too. Brilliant!

+  output_dir = "$root_out_dir/chromecast_locales"
 }
 
 buildflag_header("chromecast_features") {
   header = "chromecast_features.h"
   flags = [
     "IS_CAST_AUDIO_ONLY=$is_cast_audio_only",
     "IS_CAST_USING_CMA_BACKEND=$is_cast_using_cma_backend",
   ]
 }
 
@@ skipping 21 matching lines @@
     shared_libraries = [ "//chromecast/android:libcast_shell_android" ]
 
     deps = [
       ":cast_shell_apk_assets",
       "//base:base_java",
       "//chromecast/android:libcast_shell_android",
       "//chromecast/browser/android:cast_shell_java",
     ]
   }
 }