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

Side by Side Diff: chrome/installer/mini_installer.gypi

Issue 139403006: Revert of Enable icu_use_data_file on Windows (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 11 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 | Annotate | Revision Log
« no previous file with comments | « chrome/installer/mini_installer.gyp ('k') | chrome/installer/mini_installer/chrome.release » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 'dependencies': [ 5 'dependencies': [
6 '<@(chrome_dll_project)', 6 '<@(chrome_dll_project)',
7 '../chrome.gyp:chrome', 7 '../chrome.gyp:chrome',
8 '../chrome.gyp:chrome_nacl_win64', 8 '../chrome.gyp:chrome_nacl_win64',
9 '../chrome.gyp:default_extensions', 9 '../chrome.gyp:default_extensions',
10 '../chrome.gyp:setup', 10 '../chrome.gyp:setup',
(...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after
178 '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe', 178 '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe',
179 ], 179 ],
180 'variables': { 180 'variables': {
181 'target_arch_flag': '--target_arch=x64', 181 'target_arch_flag': '--target_arch=x64',
182 }, 182 },
183 }, { 183 }, {
184 'variables': { 184 'variables': {
185 'target_arch_flag': '--target_arch=x86', 185 'target_arch_flag': '--target_arch=x86',
186 }, 186 },
187 }], 187 }],
188 ['icu_use_data_file_flag == 0', {
189 'inputs': [
190 '<(PRODUCT_DIR)/icudt.dll',
191 ],
192 }, { # else icu_use_data_file_flag != 0
193 'inputs': [
194 '<(PRODUCT_DIR)/icudtl.dat',
195 ],
196 }],
197 ], 188 ],
198 'inputs': [ 189 'inputs': [
199 '<(create_installer_archive_py_path)', 190 '<(create_installer_archive_py_path)',
200 '<(PRODUCT_DIR)/chrome.exe', 191 '<(PRODUCT_DIR)/chrome.exe',
201 '<@(chrome_dll_path)', 192 '<@(chrome_dll_path)',
202 '<(PRODUCT_DIR)/nacl64.exe', 193 '<(PRODUCT_DIR)/nacl64.exe',
203 '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.dll', 194 '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.dll',
204 '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe', 195 '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe',
205 '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe', 196 '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe',
206 '<(PRODUCT_DIR)/locales/en-US.pak', 197 '<(PRODUCT_DIR)/locales/en-US.pak',
198 '<(PRODUCT_DIR)/icudt.dll',
207 ], 199 ],
208 'outputs': [ 200 'outputs': [
209 'xxx.out', 201 'xxx.out',
210 '<(output_dir)/<(RULE_INPUT_NAME).7z', 202 '<(output_dir)/<(RULE_INPUT_NAME).7z',
211 '<(output_dir)/<(RULE_INPUT_NAME).packed.7z', 203 '<(output_dir)/<(RULE_INPUT_NAME).packed.7z',
212 '<(output_dir)/setup.ex_', 204 '<(output_dir)/setup.ex_',
213 '<(INTERMEDIATE_DIR)/packed_files.rc', 205 '<(INTERMEDIATE_DIR)/packed_files.rc',
214 ], 206 ],
215 'action': [ 207 'action': [
216 'python', 208 'python',
(...skipping 30 matching lines...) Expand all
247 'variables': { 239 'variables': {
248 'branding_dir': '../app/theme/google_chrome', 240 'branding_dir': '../app/theme/google_chrome',
249 }, 241 },
250 }, { # else branding!="Chrome" 242 }, { # else branding!="Chrome"
251 'variables': { 243 'variables': {
252 'branding_dir': '../app/theme/chromium', 244 'branding_dir': '../app/theme/chromium',
253 }, 245 },
254 }], 246 }],
255 ], 247 ],
256 } 248 }
OLDNEW
« no previous file with comments | « chrome/installer/mini_installer.gyp ('k') | chrome/installer/mini_installer/chrome.release » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698