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

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

Issue 204023002: Turns on use_mojo=1 for windows. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: reorder Created 6 years, 9 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:chrome', 7 '../chrome.gyp:chrome',
8 '../chrome.gyp:chrome_nacl_win64', 8 '../chrome.gyp:chrome_nacl_win64',
9 '../chrome.gyp:default_extensions', 9 '../chrome.gyp:default_extensions',
10 '../chrome.gyp:setup', 10 '../chrome.gyp:setup',
(...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after
178 }], 178 }],
179 ['icu_use_data_file_flag == 0', { 179 ['icu_use_data_file_flag == 0', {
180 'inputs': [ 180 'inputs': [
181 '<(PRODUCT_DIR)/icudt.dll', 181 '<(PRODUCT_DIR)/icudt.dll',
182 ], 182 ],
183 }, { # else icu_use_data_file_flag != 0 183 }, { # else icu_use_data_file_flag != 0
184 'inputs': [ 184 'inputs': [
185 '<(PRODUCT_DIR)/icudtl.dat', 185 '<(PRODUCT_DIR)/icudtl.dat',
186 ], 186 ],
187 }], 187 }],
188 ['use_mojo==0', {
189 'inputs!': [
190 '<(PRODUCT_DIR)/mojo_system.dll',
191 ],
192 }],
188 ], 193 ],
189 'inputs': [ 194 'inputs': [
190 '<(create_installer_archive_py_path)', 195 '<(create_installer_archive_py_path)',
191 '<(PRODUCT_DIR)/chrome.exe', 196 '<(PRODUCT_DIR)/chrome.exe',
192 '<@(chrome_dll_path)', 197 '<@(chrome_dll_path)',
198 '<(PRODUCT_DIR)/mojo_system.dll',
193 '<(PRODUCT_DIR)/nacl64.exe', 199 '<(PRODUCT_DIR)/nacl64.exe',
194 '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.dll', 200 '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.dll',
195 '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe', 201 '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe',
196 '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe', 202 '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe',
197 '<(PRODUCT_DIR)/locales/en-US.pak', 203 '<(PRODUCT_DIR)/locales/en-US.pak',
198 ], 204 ],
199 'outputs': [ 205 'outputs': [
200 'xxx.out', 206 'xxx.out',
201 '<(output_dir)/<(RULE_INPUT_NAME).7z', 207 '<(output_dir)/<(RULE_INPUT_NAME).7z',
202 '<(output_dir)/<(RULE_INPUT_NAME).packed.7z', 208 '<(output_dir)/<(RULE_INPUT_NAME).packed.7z',
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
236 'variables': { 242 'variables': {
237 'branding_dir': '../app/theme/google_chrome', 243 'branding_dir': '../app/theme/google_chrome',
238 }, 244 },
239 }, { # else branding!="Chrome" 245 }, { # else branding!="Chrome"
240 'variables': { 246 'variables': {
241 'branding_dir': '../app/theme/chromium', 247 'branding_dir': '../app/theme/chromium',
242 }, 248 },
243 }], 249 }],
244 ], 250 ],
245 } 251 }
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