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

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

Issue 23539002: Delete app_host from apps/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Removed TODO Created 7 years, 3 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/chrome.release » ('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',
8 '../chrome.gyp:chrome', 7 '../chrome.gyp:chrome',
9 '../chrome.gyp:chrome_nacl_win64', 8 '../chrome.gyp:chrome_nacl_win64',
10 '../chrome.gyp:default_extensions', 9 '../chrome.gyp:default_extensions',
11 '../chrome.gyp:setup', 10 '../chrome.gyp:setup',
12 ], 11 ],
13 'include_dirs': [ 12 'include_dirs': [
14 '../..', 13 '../..',
15 '<(INTERMEDIATE_DIR)', 14 '<(INTERMEDIATE_DIR)',
16 '<(SHARED_INTERMEDIATE_DIR)/chrome', 15 '<(SHARED_INTERMEDIATE_DIR)/chrome',
17 ], 16 ],
(...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after
182 'target_arch_flag': '--target_arch=x64', 181 'target_arch_flag': '--target_arch=x64',
183 }, 182 },
184 }, { 183 }, {
185 'variables': { 184 'variables': {
186 'target_arch_flag': '--target_arch=x86', 185 'target_arch_flag': '--target_arch=x86',
187 }, 186 },
188 }], 187 }],
189 ], 188 ],
190 'inputs': [ 189 'inputs': [
191 '<(create_installer_archive_py_path)', 190 '<(create_installer_archive_py_path)',
192 '<(PRODUCT_DIR)/app_host.exe',
193 '<(PRODUCT_DIR)/chrome.exe', 191 '<(PRODUCT_DIR)/chrome.exe',
194 '<@(chrome_dll_path)', 192 '<@(chrome_dll_path)',
195 '<(PRODUCT_DIR)/nacl64.exe', 193 '<(PRODUCT_DIR)/nacl64.exe',
196 '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.dll', 194 '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.dll',
197 '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe', 195 '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe',
198 '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe', 196 '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe',
199 '<(PRODUCT_DIR)/locales/en-US.pak', 197 '<(PRODUCT_DIR)/locales/en-US.pak',
200 '<(PRODUCT_DIR)/icudt.dll', 198 '<(PRODUCT_DIR)/icudt.dll',
201 ], 199 ],
202 'outputs': [ 200 'outputs': [
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
240 'variables': { 238 'variables': {
241 'branding_dir': '../app/theme/google_chrome', 239 'branding_dir': '../app/theme/google_chrome',
242 }, 240 },
243 }, { # else branding!="Chrome" 241 }, { # else branding!="Chrome"
244 'variables': { 242 'variables': {
245 'branding_dir': '../app/theme/chromium', 243 'branding_dir': '../app/theme/chromium',
246 }, 244 },
247 }], 245 }],
248 ], 246 ],
249 } 247 }
OLDNEW
« no previous file with comments | « chrome/installer/mini_installer.gyp ('k') | chrome/installer/mini_installer/chrome.release » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698