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

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

Issue 172031: Update gyp files and DEPS for icu42 (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 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 | Annotate | Revision Log
« no previous file with comments | « chrome/common/common.vsprops ('k') | chrome/installer/mini_installer.gyp » ('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': '<(SHARED_INTERMEDIATE_DIR)/build/LASTCHANGE', 5 'lastchange_path': '<(SHARED_INTERMEDIATE_DIR)/build/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 }, 7 },
8 'includes': [ 8 'includes': [
9 '../../build/common.gypi', 9 '../../build/common.gypi',
10 ], 10 ],
11 'conditions': [ 11 'conditions': [
12 ['OS=="win"', { 12 ['OS=="win"', {
13 'targets': [ 13 'targets': [
14 { 14 {
15 'target_name': 'installer_util', 15 'target_name': 'installer_util',
16 'type': '<(library)', 16 'type': '<(library)',
17 'msvs_guid': 'EFBB1436-A63F-4CD8-9E99-B89226E782EC', 17 'msvs_guid': 'EFBB1436-A63F-4CD8-9E99-B89226E782EC',
18 'dependencies': [ 18 'dependencies': [
19 '../../app/app.gyp:app_id', 19 '../../app/app.gyp:app_id',
20 'installer_util_strings', 20 'installer_util_strings',
21 '../chrome.gyp:common', 21 '../chrome.gyp:common',
22 '../chrome.gyp:chrome_resources', 22 '../chrome.gyp:chrome_resources',
23 '../chrome.gyp:chrome_strings', 23 '../chrome.gyp:chrome_strings',
24 '../../courgette/courgette.gyp:courgette_lib', 24 '../../courgette/courgette.gyp:courgette_lib',
25 '../../third_party/bspatch/bspatch.gyp:bspatch', 25 '../../third_party/bspatch/bspatch.gyp:bspatch',
26 '../../third_party/icu38/icu38.gyp:icui18n', 26 '../../third_party/icu/icu.gyp:icui18n',
27 '../../third_party/icu38/icu38.gyp:icuuc', 27 '../../third_party/icu/icu.gyp:icuuc',
28 '../../third_party/libxml/libxml.gyp:libxml', 28 '../../third_party/libxml/libxml.gyp:libxml',
29 '../../third_party/lzma_sdk/lzma_sdk.gyp:lzma_sdk', 29 '../../third_party/lzma_sdk/lzma_sdk.gyp:lzma_sdk',
30 ], 30 ],
31 'include_dirs': [ 31 'include_dirs': [
32 '../..', 32 '../..',
33 ], 33 ],
34 'sources': [ 34 'sources': [
35 'util/browser_distribution.cc', 35 'util/browser_distribution.cc',
36 'util/browser_distribution.h', 36 'util/browser_distribution.h',
37 'util/compat_checks.cc', 37 'util/compat_checks.cc',
(...skipping 588 matching lines...) Expand 10 before | Expand all | Expand 10 after
626 'variables': { 626 'variables': {
627 'branding_dir': '../app/theme/google_chrome', 627 'branding_dir': '../app/theme/google_chrome',
628 }, 628 },
629 }, { # else branding!="Chrome" 629 }, { # else branding!="Chrome"
630 'variables': { 630 'variables': {
631 'branding_dir': '../app/theme/chromium', 631 'branding_dir': '../app/theme/chromium',
632 }, 632 },
633 }], 633 }],
634 ], 634 ],
635 } 635 }
OLDNEW
« no previous file with comments | « chrome/common/common.vsprops ('k') | chrome/installer/mini_installer.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698