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

Side by Side Diff: chrome/chrome_repack_locales.gni

Issue 575923004: Fix is_chrome_branded check in chrome_repack_locales.gni. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 6 years, 3 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 unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 import("//build/config/features.gni") 5 import("//build/config/features.gni")
6 import("//build/config/ui.gni") 6 import("//build/config/ui.gni")
7 import("//tools/grit/repack.gni") 7 import("//tools/grit/repack.gni")
8 8
9 # Arguments: 9 # Arguments:
10 # 10 #
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 "${root_gen_dir}/extensions/strings/extensions_strings_${locale}.pak", 80 "${root_gen_dir}/extensions/strings/extensions_strings_${locale}.pak",
81 ] 81 ]
82 deps += [ 82 deps += [
83 "//device/bluetooth:strings", 83 "//device/bluetooth:strings",
84 "//extensions/strings", 84 "//extensions/strings",
85 ] 85 ]
86 } 86 }
87 87
88 if (is_chrome_branded) { 88 if (is_chrome_branded) {
89 sources += [ 89 sources += [
90 "${root_gen_dir}/chrome/google_chrome_strings_${locale}.pak",
91 ]
92 deps += [
93 "//chrome/app:google_chrome_strings",
94 ]
95 } else {
96 sources += [
90 "${root_gen_dir}/chrome/chromium_strings_${locale}.pak", 97 "${root_gen_dir}/chrome/chromium_strings_${locale}.pak",
91 ] 98 ]
92 deps += [ 99 deps += [
93 "//chrome/app:chromium_strings", 100 "//chrome/app:chromium_strings",
94 ] 101 ]
95 } else {
96 sources += [
97 "${root_gen_dir}/chrome/google_chrome_strings_${locale}.pak",
98 ]
99 deps += [
100 "//chrome/app:google_chrome_strings",
101 ]
102 } 102 }
103 103
104 output = invoker.output 104 output = invoker.output
105 } 105 }
106 } 106 }
107 107
108 # Creates an action to call the repack_locales script. 108 # Creates an action to call the repack_locales script.
109 # 109 #
110 # The GYP version generates the locales in the "gen" directory and then copies 110 # The GYP version generates the locales in the "gen" directory and then copies
111 # it to the root build directory. This isn't easy to express in a GN copy 111 # it to the root build directory. This isn't easy to express in a GN copy
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
165 } 165 }
166 166
167 # The group that external targets depend on which collects all deps. 167 # The group that external targets depend on which collects all deps.
168 group(group_target_name) { 168 group(group_target_name) {
169 if (defined(invoker.visibility)) { 169 if (defined(invoker.visibility)) {
170 visibility = invoker.visibility 170 visibility = invoker.visibility
171 } 171 }
172 deps = locale_targets 172 deps = locale_targets
173 } 173 }
174 } 174 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698