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

Unified Diff: chrome/chrome_repack_locales.gni

Issue 1224273008: bluetooth: android: Strings included in Chrome build. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@bta-discovery-2-
Patch Set: Merge TOT Created 5 years, 5 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 | « no previous file | chrome/chrome_resources.gyp » ('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 d19888ce2d11180c28924cc6570b5b7a9dda6354..d9a6e90417d360ea38e5f2489ddc0a8a3a2de8c1 100644
--- a/chrome/chrome_repack_locales.gni
+++ b/chrome/chrome_repack_locales.gni
@@ -54,11 +54,13 @@ template("_repack_one_locale") {
if (!is_ios) {
sources += [
"${root_gen_dir}/content/app/strings/content_strings_${locale}.pak",
+ "${root_gen_dir}/device/bluetooth/strings/device_bluetooth_strings_${locale}.pak",
"${root_gen_dir}/ui/strings/app_locale_settings_${locale}.pak",
"${root_gen_dir}/ui/strings/ui_strings_${locale}.pak",
]
deps += [
"//content/app/strings",
+ "//device/bluetooth/strings",
"//ui/strings:ui_strings",
"//ui/strings:app_locale_settings",
]
@@ -69,16 +71,11 @@ template("_repack_one_locale") {
}
if (enable_extensions) {
sources += [
- "${root_gen_dir}/device/bluetooth/device_bluetooth_strings_${locale}.pak",
-
# TODO(jamescook): When Android stops building extensions code move
# this to the OS != 'ios' and OS != 'android' section.
"${root_gen_dir}/extensions/strings/extensions_strings_${locale}.pak",
]
- deps += [
- "//device/bluetooth:strings",
- "//extensions/strings",
- ]
+ deps += [ "//extensions/strings" ]
}
if (is_chrome_branded) {
« no previous file with comments | « no previous file | chrome/chrome_resources.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698