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

Side by Side Diff: chrome/chrome_exe.gypi

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 | « build/all.gyp ('k') | chrome/installer/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 # Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2009 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 { 5 {
6 'target_defaults': { 6 'target_defaults': {
7 'variables': { 7 'variables': {
8 'chrome_exe_target': 0, 8 'chrome_exe_target': 0,
9 }, 9 },
10 'target_conditions': [ 10 'target_conditions': [
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 'mac_bundle': 1, 127 'mac_bundle': 1,
128 'msvs_guid': '7B219FAA-E360-43C8-B341-804A94EEFFAC', 128 'msvs_guid': '7B219FAA-E360-43C8-B341-804A94EEFFAC',
129 'variables': { 129 'variables': {
130 'chrome_exe_target': 1, 130 'chrome_exe_target': 1,
131 }, 131 },
132 'conditions': [ 132 'conditions': [
133 ['chrome_frame_define==1 and OS=="win"', { 133 ['chrome_frame_define==1 and OS=="win"', {
134 # TODO(gregoryd): This could be shared with the 64-bit target, but 134 # TODO(gregoryd): This could be shared with the 64-bit target, but
135 # it does not work due to a gyp issue. 135 # it does not work due to a gyp issue.
136 'dependencies': [ 136 'dependencies': [
137 '../chrome_frame/chrome_frame.gyp:npchrome_tab', 137 '../chrome_frame/chrome_frame.gyp:npchrome_frame',
138 ], 138 ],
139 }], 139 }],
140 ['OS=="linux" or OS=="freebsd"', { 140 ['OS=="linux" or OS=="freebsd"', {
141 'actions': [ 141 'actions': [
142 { 142 {
143 'action_name': 'manpage', 143 'action_name': 'manpage',
144 'conditions': [ 144 'conditions': [
145 [ 'branding == "Chrome"', { 145 [ 'branding == "Chrome"', {
146 'variables': { 146 'variables': {
147 'name': 'Google Chrome', 147 'name': 'Google Chrome',
(...skipping 374 matching lines...) Expand 10 before | Expand all | Expand 10 after
522 'VCLinkerTool': { 522 'VCLinkerTool': {
523 'ImportLibrary': '$(OutDir)\\lib\\nacl_exe.lib', 523 'ImportLibrary': '$(OutDir)\\lib\\nacl_exe.lib',
524 'ProgramDatabaseFile': '$(OutDir)\\nacl_exe.pdb', 524 'ProgramDatabaseFile': '$(OutDir)\\nacl_exe.pdb',
525 }, 525 },
526 }, 526 },
527 'conditions': [ 527 'conditions': [
528 ['chrome_frame_define==1 and OS=="win"', { 528 ['chrome_frame_define==1 and OS=="win"', {
529 # TODO(gregoryd): This could be shared with the 32-bit target, but 529 # TODO(gregoryd): This could be shared with the 32-bit target, but
530 # it does not work due to a gyp issue. 530 # it does not work due to a gyp issue.
531 'dependencies': [ 531 'dependencies': [
532 '../chrome_frame/chrome_frame.gyp:npchrome_tab', 532 '../chrome_frame/chrome_frame.gyp:npchrome_frame',
533 ], 533 ],
534 }], 534 }],
535 ], 535 ],
536 'configurations': { 536 'configurations': {
537 'Common_Base': { 537 'Common_Base': {
538 'msvs_target_platform': 'x64', 538 'msvs_target_platform': 'x64',
539 }, 539 },
540 }, 540 },
541 }, 541 },
542 ], 542 ],
543 }], 543 }],
544 ], 544 ],
545 } 545 }
OLDNEW
« no previous file with comments | « build/all.gyp ('k') | chrome/installer/installer.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698