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

Unified Diff: chrome/chrome_exe.gypi

Issue 542078: Adding a secondary mini_installer target for Chrome Frame. This will remove t... (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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/chrome.gyp ('k') | chrome/installer/installer.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_exe.gypi
===================================================================
--- chrome/chrome_exe.gypi (revision 36244)
+++ chrome/chrome_exe.gypi (working copy)
@@ -130,13 +130,6 @@
'chrome_exe_target': 1,
},
'conditions': [
- ['chrome_frame_define==1 and OS=="win"', {
- # TODO(gregoryd): This could be shared with the 64-bit target, but
- # it does not work due to a gyp issue.
- 'dependencies': [
- '../chrome_frame/chrome_frame.gyp:npchrome_frame',
- ],
- }],
['OS=="linux" or OS=="freebsd"', {
'actions': [
{
@@ -509,6 +502,7 @@
'../breakpad/breakpad.gyp:breakpad_handler_win64',
'../breakpad/breakpad.gyp:breakpad_sender_win64',
'../base/base.gyp:base_nacl_win64',
+ '../chrome_frame/chrome_frame.gyp:npchrome_frame',
# TODO(gregoryd): build sandbox for 64 bit
# '../sandbox/sandbox.gyp:sandbox',
],
@@ -524,15 +518,6 @@
'ProgramDatabaseFile': '$(OutDir)\\nacl_exe.pdb',
},
},
- 'conditions': [
- ['chrome_frame_define==1 and OS=="win"', {
- # TODO(gregoryd): This could be shared with the 32-bit target, but
- # it does not work due to a gyp issue.
- 'dependencies': [
- '../chrome_frame/chrome_frame.gyp:npchrome_frame',
- ],
- }],
- ],
'configurations': {
'Common_Base': {
'msvs_target_platform': 'x64',
« no previous file with comments | « chrome/chrome.gyp ('k') | chrome/installer/installer.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698