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

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

Issue 10790144: Revert 148046 - 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/installer/mini_installer.gyp ('k') | chrome/installer/mini_installer/appid.h » ('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) 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:chrome', 8 '../chrome.gyp:chrome',
8 '../chrome.gyp:chrome_nacl_win64', 9 '../chrome.gyp:chrome_nacl_win64',
9 '../chrome.gyp:default_extensions', 10 '../chrome.gyp:default_extensions',
10 '../chrome.gyp:setup', 11 '../chrome.gyp:setup',
11 ], 12 ],
12 'include_dirs': [ 13 'include_dirs': [
13 '../..', 14 '../..',
14 '<(INTERMEDIATE_DIR)', 15 '<(INTERMEDIATE_DIR)',
15 '<(SHARED_INTERMEDIATE_DIR)/chrome', 16 '<(SHARED_INTERMEDIATE_DIR)/chrome',
16 ], 17 ],
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after
172 'enable_touch_ui_flag': '--enable_touch_ui=1', 173 'enable_touch_ui_flag': '--enable_touch_ui=1',
173 }, 174 },
174 }, { 175 }, {
175 'variables': { 176 'variables': {
176 'enable_touch_ui_flag': '', 177 'enable_touch_ui_flag': '',
177 }, 178 },
178 }], 179 }],
179 ], 180 ],
180 'inputs': [ 181 'inputs': [
181 '<(create_installer_archive_py_path)', 182 '<(create_installer_archive_py_path)',
183 '<(PRODUCT_DIR)/app_host.exe',
182 '<(PRODUCT_DIR)/chrome.exe', 184 '<(PRODUCT_DIR)/chrome.exe',
183 '<(chrome_dll_path)', 185 '<(chrome_dll_path)',
184 '<(PRODUCT_DIR)/nacl64.exe', 186 '<(PRODUCT_DIR)/nacl64.exe',
185 '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.dll', 187 '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.dll',
186 '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe', 188 '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe',
187 '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe', 189 '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe',
188 '<(PRODUCT_DIR)/locales/en-US.pak', 190 '<(PRODUCT_DIR)/locales/en-US.pak',
189 '<(PRODUCT_DIR)/icudt.dll', 191 '<(PRODUCT_DIR)/icudt.dll',
190 ], 192 ],
191 'outputs': [ 193 'outputs': [
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
228 'variables': { 230 'variables': {
229 'branding_dir': '../app/theme/google_chrome', 231 'branding_dir': '../app/theme/google_chrome',
230 }, 232 },
231 }, { # else branding!="Chrome" 233 }, { # else branding!="Chrome"
232 'variables': { 234 'variables': {
233 'branding_dir': '../app/theme/chromium', 235 'branding_dir': '../app/theme/chromium',
234 }, 236 },
235 }], 237 }],
236 ], 238 ],
237 } 239 }
OLDNEW
« no previous file with comments | « chrome/installer/mini_installer.gyp ('k') | chrome/installer/mini_installer/appid.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698