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

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

Issue 10818021: Revert 147650 - Implement installation of the Chrome App Host. (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1215/src/
Patch Set: Created 8 years, 5 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/chrome_switches.cc ('k') | chrome/installer/mini_installer.gypi » ('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': '<(DEPTH)/build/util/LASTCHANGE', 5 'lastchange_path': '<(DEPTH)/build/util/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 'msvs_use_common_release': 0, 7 'msvs_use_common_release': 0,
8 'msvs_use_common_linker_extras': 0, 8 'msvs_use_common_linker_extras': 0,
9 'mini_installer_internal_deps%': 0, 9 'mini_installer_internal_deps%': 0,
10 'mini_installer_official_deps%': 0, 10 'mini_installer_official_deps%': 0,
11 }, 11 },
12 'includes': [ 12 'includes': [
13 '../../build/win_precompile.gypi', 13 '../../build/win_precompile.gypi',
14 ], 14 ],
15 'conditions': [ 15 'conditions': [
16 ['OS=="win"', { 16 ['OS=="win"', {
17 'target_defaults': { 17 'target_defaults': {
18 'dependencies': [ 18 'dependencies': [
19 '../chrome.gyp:app_host',
20 '../chrome.gyp:chrome', 19 '../chrome.gyp:chrome',
21 '../chrome.gyp:chrome_nacl_win64', 20 '../chrome.gyp:chrome_nacl_win64',
22 '../chrome.gyp:chrome_dll', 21 '../chrome.gyp:chrome_dll',
23 '../chrome.gyp:default_extensions', 22 '../chrome.gyp:default_extensions',
24 '../chrome.gyp:setup', 23 '../chrome.gyp:setup',
25 ], 24 ],
26 'include_dirs': [ 25 'include_dirs': [
27 '../..', 26 '../..',
28 '<(INTERMEDIATE_DIR)', 27 '<(INTERMEDIATE_DIR)',
29 '<(SHARED_INTERMEDIATE_DIR)/chrome', 28 '<(SHARED_INTERMEDIATE_DIR)/chrome',
(...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after
228 'inputs!': [ 227 'inputs!': [
229 '<(PRODUCT_DIR)/nacl64.exe', 228 '<(PRODUCT_DIR)/nacl64.exe',
230 '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.dll', 229 '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.dll',
231 '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe', 230 '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe',
232 '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe', 231 '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe',
233 ], 232 ],
234 }], 233 }],
235 ], 234 ],
236 'inputs': [ 235 'inputs': [
237 '<(create_installer_archive_py_path)', 236 '<(create_installer_archive_py_path)',
238 '<(PRODUCT_DIR)/app_host.exe',
239 '<(PRODUCT_DIR)/chrome.exe', 237 '<(PRODUCT_DIR)/chrome.exe',
240 '<(PRODUCT_DIR)/chrome.dll', 238 '<(PRODUCT_DIR)/chrome.dll',
241 '<(PRODUCT_DIR)/nacl64.exe', 239 '<(PRODUCT_DIR)/nacl64.exe',
242 '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.dll', 240 '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.dll',
243 '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe', 241 '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe',
244 '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe', 242 '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe',
245 '<(PRODUCT_DIR)/locales/en-US.pak', 243 '<(PRODUCT_DIR)/locales/en-US.pak',
246 '<(PRODUCT_DIR)/icudt.dll', 244 '<(PRODUCT_DIR)/icudt.dll',
247 ], 245 ],
248 'outputs': [ 246 'outputs': [
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
287 'variables': { 285 'variables': {
288 'branding_dir': '../app/theme/google_chrome', 286 'branding_dir': '../app/theme/google_chrome',
289 }, 287 },
290 }, { # else branding!="Chrome" 288 }, { # else branding!="Chrome"
291 'variables': { 289 'variables': {
292 'branding_dir': '../app/theme/chromium', 290 'branding_dir': '../app/theme/chromium',
293 }, 291 },
294 }], 292 }],
295 ], 293 ],
296 } 294 }
OLDNEW
« no previous file with comments | « chrome/common/chrome_switches.cc ('k') | chrome/installer/mini_installer.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698