Fix components strings dependencies

Compiling localized_error needs to depend on the components strings to
avoid a race-condition while building, and repack_locales needed to be
updated to include them into the our locales pak.

Change-Id: I3250b2bbad717f560eeaaf31d59e45167225191e
Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>

1 files changed, 16 insertions, 0 deletions

diff --git a/tools/buildscripts/repack_locales.py b/tools/buildscripts/repack_locales.py
index 3d974c93a..102129680 100755
--- a/tools/buildscripts/repack_locales.py
+++ b/tools/buildscripts/repack_locales.py
@@ -59,6 +59,9 @@ chrome_src = utils.getChromiumSrcDir()
 sys.path.append(os.path.join(chrome_src, 'tools', 'grit'))
 from grit.format import data_pack
 
+# The gyp "branding" variable.
+BRANDING = 'chromium'
+
 # Some build paths defined by gyp.
 SHARE_INT_DIR = None
 INT_DIR = None
@@ -84,6 +87,19 @@ def calc_inputs(locale):
   """Determine the files that need processing for the given locale."""
   inputs = []
 
+  #e.g. '<(SHARED_INTERMEDIATE_DIR)/components/strings/
+  # components_strings_da.pak',
+  inputs.append(os.path.join(SHARE_INT_DIR, 'components', 'strings',
+                'components_strings_%s.pak' % locale))
+
+  #e.g. '<(SHARED_INTERMEDIATE_DIR)/components/strings/
+  # components_chromium_strings_da.pak'
+  #     or
+  #     '<(SHARED_INTERMEDIATE_DIR)/components/strings/
+  # components_google_chrome_strings_da.pak',
+  inputs.append(os.path.join(SHARE_INT_DIR, 'components', 'strings',
+                'components_%s_strings_%s.pak' % (BRANDING, locale)))
+
   if OS != 'ios':
     #e.g. '<(SHARED_INTERMEDIATE_DIR)/content/app/strings/content_strings_en-US.pak'
     inputs.append(os.path.join(SHARE_INT_DIR, 'content', 'app', 'strings',