Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4307)

Unified Diff: chrome/chrome_repack_locales.gni

Issue 2769483002: Don't check is_ios in chrome/, it's always false there. (Closed)
Patch Set: Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/resources/BUILD.gn ('k') | chrome/common/features.gni » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_repack_locales.gni
diff --git a/chrome/chrome_repack_locales.gni b/chrome/chrome_repack_locales.gni
index e57c406965ca3c1792cc86983e38214df83665d4..7b432a87c7d85b1e95c73debeda797b55b0b3c77 100644
--- a/chrome/chrome_repack_locales.gni
+++ b/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_" ]
« no previous file with comments | « chrome/browser/resources/BUILD.gn ('k') | chrome/common/features.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698