diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-07-12 14:07:37 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-07-17 10:29:26 +0000 |
| commit | ec02ee4181c49b61fce1c8fb99292dbb8139cc90 (patch) | |
| tree | 25cde714b2b71eb639d1cd53f5a22e9ba76e14ef /chromium/chrome/chrome_repack_locales.gni | |
| parent | bb09965444b5bb20b096a291445170876225268d (diff) | |
| download | qtwebengine-chromium-ec02ee4181c49b61fce1c8fb99292dbb8139cc90.tar.gz | |
BASELINE: Update Chromium to 59.0.3071.134
Change-Id: Id02ef6fb2204c5fd21668a1c3e6911c83b17585a
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/chrome/chrome_repack_locales.gni')
| -rw-r--r-- | chromium/chrome/chrome_repack_locales.gni | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/chromium/chrome/chrome_repack_locales.gni b/chromium/chrome/chrome_repack_locales.gni index e57c406965c..7b432a87c7d 100644 --- a/chromium/chrome/chrome_repack_locales.gni +++ b/chromium/chrome/chrome_repack_locales.gni @@ -8,6 +8,8 @@ import("//build/config/ui.gni") import("//extensions/features/features.gni") import("//tools/grit/repack.gni") +assert(!is_ios, "Chromium/iOS shouldn't use anything in //chrome") + # Wraps repack_locales(), setting the source_patterns and deps required for # Chrome. # @@ -26,6 +28,11 @@ template("chrome_repack_locales") { "${root_gen_dir}/chrome/platform_locale_settings_", "${root_gen_dir}/components/strings/components_locale_settings_", "${root_gen_dir}/components/strings/components_strings_", + "${root_gen_dir}/content/app/strings/content_strings_", + "${root_gen_dir}/device/bluetooth/strings/bluetooth_strings_", + "${root_gen_dir}/third_party/libaddressinput/address_input_strings_", + "${root_gen_dir}/ui/strings/app_locale_settings_", + "${root_gen_dir}/ui/strings/ui_strings_", ] if (!defined(deps)) { deps = [] @@ -36,6 +43,11 @@ template("chrome_repack_locales") { "//chrome/app/resources:platform_locale_settings", "//components/strings:components_locale_settings", "//components/strings:components_strings", + "//content/app/strings", + "//device/bluetooth/strings", + "//third_party/libaddressinput:strings", + "//ui/strings:app_locale_settings", + "//ui/strings:ui_strings", ] if (defined(invoker.deps)) { deps += invoker.deps @@ -55,22 +67,6 @@ template("chrome_repack_locales") { "//ui/chromeos/strings", ] } - if (!is_ios) { - source_patterns += [ - "${root_gen_dir}/content/app/strings/content_strings_", - "${root_gen_dir}/device/bluetooth/strings/bluetooth_strings_", - "${root_gen_dir}/third_party/libaddressinput/address_input_strings_", - "${root_gen_dir}/ui/strings/app_locale_settings_", - "${root_gen_dir}/ui/strings/ui_strings_", - ] - deps += [ - "//content/app/strings", - "//device/bluetooth/strings", - "//third_party/libaddressinput:strings", - "//ui/strings:app_locale_settings", - "//ui/strings:ui_strings", - ] - } if (enable_extensions) { source_patterns += [ "${root_gen_dir}/extensions/strings/extensions_strings_" ] |