diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2016-12-09 15:08:04 +0100 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2016-12-15 14:00:36 +0000 |
| commit | e87fa1f7fd4bf85e9d4250c69de32d43d9e5c8a0 (patch) | |
| tree | 92b009242ebe7e7a9fc3cf65fd86fa225d086cb2 | |
| parent | e4788880a0d2c2d6b0d59ffac90a41bfb3c745dd (diff) | |
Fix target collision for locales repack
Due to 'visibility' limitation we call ourself repack locales.
This generates same locale targets as chromium does.
Add output directory name as a parameter to differentiate
the target.
Change-Id: I91929a264f0a1777ad7b3a787c99476c889fa5ec
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| -rw-r--r-- | chromium/chrome/chrome_repack_locales.gni | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/chromium/chrome/chrome_repack_locales.gni b/chromium/chrome/chrome_repack_locales.gni index 9601dd4eb85..573fac97a6b 100644 --- a/chromium/chrome/chrome_repack_locales.gni +++ b/chromium/chrome/chrome_repack_locales.gni @@ -160,7 +160,9 @@ template("chrome_repack_locales") { locale = input_locale # Compute the output name. Mac uses a different location. - if (is_mac || is_ios) { + if (use_qt && defined(invoker.output_dir_name)) { + output = "${root_out_dir}/${invoker.output_dir_name}/${output_locale}.pak" + } else if (is_mac || is_ios) { output = "${root_gen_dir}/repack/locales/${output_locale}.pak" } else { output = "${root_out_dir}/locales/${output_locale}.pak" |