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

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

Issue 10879020: Refactor manifests to allow all executables to use the same base manifests as AdditionalManifestFil… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: pather Created 8 years, 4 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
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 'dependencies': [ 5 'dependencies': [
6 '<(chrome_dll_project)', 6 '<(chrome_dll_project)',
7 '../chrome.gyp:app_host', 7 '../chrome.gyp:app_host',
8 '../chrome.gyp:chrome', 8 '../chrome.gyp:chrome',
9 '../chrome.gyp:chrome_nacl_win64', 9 '../chrome.gyp:chrome_nacl_win64',
10 '../chrome.gyp:default_extensions', 10 '../chrome.gyp:default_extensions',
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 ['MSVS_VERSION=="2005e"', { 70 ['MSVS_VERSION=="2005e"', {
71 'AdditionalDependencies': [ # Must explicitly link in VC2005E 71 'AdditionalDependencies': [ # Must explicitly link in VC2005E
72 'advapi32.lib', 72 'advapi32.lib',
73 'shell32.lib', 73 'shell32.lib',
74 ], 74 ],
75 }], 75 }],
76 ], 76 ],
77 }, 77 },
78 'VCManifestTool': { 78 'VCManifestTool': {
79 'AdditionalManifestFiles': [ 79 'AdditionalManifestFiles': [
80 '$(ProjectDir)\\mini_installer\\mini_installer.exe.manifest', 80 '$(ProjectDir)\\..\\app\\additional.manifest',
81 ], 81 ],
82 }, 82 },
83 }, 83 },
84 'configurations': { 84 'configurations': {
85 'Debug_Base': { 85 'Debug_Base': {
86 'msvs_settings': { 86 'msvs_settings': {
87 'VCCLCompilerTool': { 87 'VCCLCompilerTool': {
88 'BasicRuntimeChecks': '0', 88 'BasicRuntimeChecks': '0',
89 'BufferSecurityCheck': 'false', 89 'BufferSecurityCheck': 'false',
90 'ExceptionHandling': '0', 90 'ExceptionHandling': '0',
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
230 'variables': { 230 'variables': {
231 'branding_dir': '../app/theme/google_chrome', 231 'branding_dir': '../app/theme/google_chrome',
232 }, 232 },
233 }, { # else branding!="Chrome" 233 }, { # else branding!="Chrome"
234 'variables': { 234 'variables': {
235 'branding_dir': '../app/theme/chromium', 235 'branding_dir': '../app/theme/chromium',
236 }, 236 },
237 }], 237 }],
238 ], 238 ],
239 } 239 }
OLDNEW
« no previous file with comments | « chrome/installer/mini_installer.gyp ('k') | chrome/installer/mini_installer/mini_installer.exe.manifest » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698