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

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

Issue 523040: Some Chrome Frame cleanup:... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 10 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/chrome_exe.gypi ('k') | chrome/installer/util/util_constants.cc » ('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 # Two versions of installer_util target are defined in installer_util.gypi. 9 # Two versions of installer_util target are defined in installer_util.gypi.
10 # This allows to keep all the settings relevant to these targets in one 10 # This allows to keep all the settings relevant to these targets in one
(...skipping 248 matching lines...) Expand 10 before | Expand all | Expand 10 after
259 '--header_output_dir=<(INTERMEDIATE_DIR)', 259 '--header_output_dir=<(INTERMEDIATE_DIR)',
260 # TODO(sgk): may just use environment variables 260 # TODO(sgk): may just use environment variables
261 #'--distribution=$(CHROMIUM_BUILD)', 261 #'--distribution=$(CHROMIUM_BUILD)',
262 '--distribution=_google_chrome', 262 '--distribution=_google_chrome',
263 ], 263 ],
264 }, 264 },
265 ], 265 ],
266 'conditions': [ 266 'conditions': [
267 ['chrome_frame_define==1', { 267 ['chrome_frame_define==1', {
268 'dependencies': [ 268 'dependencies': [
269 '../../chrome_frame/chrome_frame.gyp:npchrome_tab', 269 '../../chrome_frame/chrome_frame.gyp:npchrome_frame',
270 ], 270 ],
271 }], 271 }],
272 # TODO(mark): <(branding_dir) should be defined by the 272 # TODO(mark): <(branding_dir) should be defined by the
273 # global condition block at the bottom of the file, but 273 # global condition block at the bottom of the file, but
274 # this doesn't work due to the following issue: 274 # this doesn't work due to the following issue:
275 # 275 #
276 # http://code.google.com/p/gyp/issues/detail?id=22 276 # http://code.google.com/p/gyp/issues/detail?id=22
277 # 277 #
278 # Remove this block once the above issue is fixed. 278 # Remove this block once the above issue is fixed.
279 [ 'branding == "Chrome"', { 279 [ 'branding == "Chrome"', {
(...skipping 477 matching lines...) Expand 10 before | Expand all | Expand 10 after
757 }, 757 },
758 }], 758 }],
759 ], 759 ],
760 } 760 }
761 761
762 # Local Variables: 762 # Local Variables:
763 # tab-width:2 763 # tab-width:2
764 # indent-tabs-mode:nil 764 # indent-tabs-mode:nil
765 # End: 765 # End:
766 # vim: set expandtab tabstop=2 shiftwidth=2: 766 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « chrome/chrome_exe.gypi ('k') | chrome/installer/util/util_constants.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698