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

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

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 | « build/common.gypi ('k') | chrome/installer/mini_installer.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 { 1 {
2 'variables': { 2 'variables': {
3 'version_py': '../../chrome/tools/build/version.py', 3 'version_py': '../../chrome/tools/build/version.py',
4 'version_path': '../../chrome/VERSION', 4 'version_path': '../../chrome/VERSION',
5 'lastchange_path': '<(DEPTH)/build/util/LASTCHANGE', 5 'lastchange_path': '<(DEPTH)/build/util/LASTCHANGE',
6 # 'branding_dir' is set in the 'conditions' section at the bottom. 6 # 'branding_dir' is set in the 'conditions' section at the bottom.
7 'msvs_use_common_release': 0, 7 'msvs_use_common_release': 0,
8 'msvs_use_common_linker_extras': 0, 8 'msvs_use_common_linker_extras': 0,
9 'mini_installer_internal_deps%': 0, 9 'mini_installer_internal_deps%': 0,
10 'mini_installer_official_deps%': 0, 10 'mini_installer_official_deps%': 0,
(...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after
216 '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe', 216 '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe',
217 ], 217 ],
218 'variables': { 218 'variables': {
219 'target_arch_flag': '--target_arch=x64', 219 'target_arch_flag': '--target_arch=x64',
220 }, 220 },
221 }, { 221 }, {
222 'variables': { 222 'variables': {
223 'target_arch_flag': '--target_arch=x86', 223 'target_arch_flag': '--target_arch=x86',
224 }, 224 },
225 }], 225 }],
226 ['icu_use_data_file_flag == 0', {
227 'inputs': [
228 '<(PRODUCT_DIR)/icudt.dll',
229 ],
230 }, { # else icu_use_data_file_flag != 0
231 'inputs': [
232 '<(PRODUCT_DIR)/icudtl.dat',
233 ],
234 }],
235 ], 226 ],
236 'inputs': [ 227 'inputs': [
237 '<(create_installer_archive_py_path)', 228 '<(create_installer_archive_py_path)',
238 '<(PRODUCT_DIR)/chrome.exe', 229 '<(PRODUCT_DIR)/chrome.exe',
239 '<(PRODUCT_DIR)/chrome.dll', 230 '<(PRODUCT_DIR)/chrome.dll',
240 '<(PRODUCT_DIR)/nacl64.exe', 231 '<(PRODUCT_DIR)/nacl64.exe',
241 '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.dll', 232 '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.dll',
242 '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe', 233 '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe',
243 '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe', 234 '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe',
244 '<(PRODUCT_DIR)/locales/en-US.pak', 235 '<(PRODUCT_DIR)/locales/en-US.pak',
236 '<(PRODUCT_DIR)/icudt.dll',
245 ], 237 ],
246 'outputs': [ 238 'outputs': [
247 # Also note that chrome.packed.7z is defined as an output in a 239 # Also note that chrome.packed.7z is defined as an output in a
248 # conditional above. 240 # conditional above.
249 'xxx2.out', 241 'xxx2.out',
250 '<(PRODUCT_DIR)/<(RULE_INPUT_NAME).7z', 242 '<(PRODUCT_DIR)/<(RULE_INPUT_NAME).7z',
251 '<(PRODUCT_DIR)/setup.ex_', 243 '<(PRODUCT_DIR)/setup.ex_',
252 '<(INTERMEDIATE_DIR)/packed_files.rc', 244 '<(INTERMEDIATE_DIR)/packed_files.rc',
253 ], 245 ],
254 'action': [ 246 'action': [
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
319 'variables': { 311 'variables': {
320 'branding_dir': '../app/theme/google_chrome', 312 'branding_dir': '../app/theme/google_chrome',
321 }, 313 },
322 }, { # else branding!="Chrome" 314 }, { # else branding!="Chrome"
323 'variables': { 315 'variables': {
324 'branding_dir': '../app/theme/chromium', 316 'branding_dir': '../app/theme/chromium',
325 }, 317 },
326 }], 318 }],
327 ], 319 ],
328 } 320 }
OLDNEW
« no previous file with comments | « build/common.gypi ('k') | chrome/installer/mini_installer.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698