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

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

Issue 7863024: Make the NaCl windows 64 bit binaries not depend on chrome targets. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: simplify chrome_exe.gypi Created 9 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/common/nacl_cmd_line.cc ('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 { 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': '<(SHARED_INTERMEDIATE_DIR)/build/LASTCHANGE', 5 'lastchange_path': '<(SHARED_INTERMEDIATE_DIR)/build/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 }, 9 },
10 'includes': [ 10 'includes': [
(...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after
185 'extension': 'release', 185 'extension': 'release',
186 'variables': { 186 'variables': {
187 'create_installer_archive_py_path': 187 'create_installer_archive_py_path':
188 '../tools/build/win/create_installer_archive.py', 188 '../tools/build/win/create_installer_archive.py',
189 }, 189 },
190 'inputs': [ 190 'inputs': [
191 '<(create_installer_archive_py_path)', 191 '<(create_installer_archive_py_path)',
192 '<(PRODUCT_DIR)/chrome.exe', 192 '<(PRODUCT_DIR)/chrome.exe',
193 '<(PRODUCT_DIR)/chrome.dll', 193 '<(PRODUCT_DIR)/chrome.dll',
194 '<(PRODUCT_DIR)/nacl64.exe', 194 '<(PRODUCT_DIR)/nacl64.exe',
195 '<(PRODUCT_DIR)/nacl64.dll',
196 '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.dll', 195 '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.dll',
197 '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe', 196 '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe',
198 '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe', 197 '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe',
199 '<(PRODUCT_DIR)/locales/en-US.pak', 198 '<(PRODUCT_DIR)/locales/en-US.pak',
200 '<(PRODUCT_DIR)/icudt.dll', 199 '<(PRODUCT_DIR)/icudt.dll',
201 ], 200 ],
202 'outputs': [ 201 'outputs': [
203 'xxx.out', 202 'xxx.out',
204 '<(PRODUCT_DIR)/<(RULE_INPUT_NAME).7z', 203 '<(PRODUCT_DIR)/<(RULE_INPUT_NAME).7z',
205 '<(PRODUCT_DIR)/<(RULE_INPUT_NAME).packed.7z', 204 '<(PRODUCT_DIR)/<(RULE_INPUT_NAME).packed.7z',
(...skipping 23 matching lines...) Expand all
229 'variables': { 228 'variables': {
230 'branding_dir': '../app/theme/google_chrome', 229 'branding_dir': '../app/theme/google_chrome',
231 }, 230 },
232 }, { # else branding!="Chrome" 231 }, { # else branding!="Chrome"
233 'variables': { 232 'variables': {
234 'branding_dir': '../app/theme/chromium', 233 'branding_dir': '../app/theme/chromium',
235 }, 234 },
236 }], 235 }],
237 ], 236 ],
238 } 237 }
OLDNEW
« no previous file with comments | « chrome/common/nacl_cmd_line.cc ('k') | chrome/installer/mini_installer/chrome.release » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698