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

Side by Side Diff: chrome/chrome_dll.gypi

Issue 11275326: Change the names of the NaCl IRT files to solve ChromeOS packaging issue. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 1 month 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/browser/nacl_host/nacl_browser.cc ('k') | chrome/chrome_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 # 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 'conditions': [ 5 'conditions': [
6 ['OS=="mac" or OS=="win"', { 6 ['OS=="mac" or OS=="win"', {
7 'targets': [ 7 'targets': [
8 { 8 {
9 'target_name': 'chrome_dll', 9 'target_name': 'chrome_dll',
10 'type': 'none', 10 'type': 'none',
(...skipping 348 matching lines...) Expand 10 before | Expand all | Expand 10 after
359 'files': [ 359 'files': [
360 '<(PRODUCT_DIR)/PDF.plugin', 360 '<(PRODUCT_DIR)/PDF.plugin',
361 ], 361 ],
362 }], 362 }],
363 ['disable_nacl!=1', { 363 ['disable_nacl!=1', {
364 'files': [ 364 'files': [
365 '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.plugin', 365 '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.plugin',
366 # We leave out x86-64 IRT nexes because we only 366 # We leave out x86-64 IRT nexes because we only
367 # support x86-32 NaCl on Mac OS X. 367 # support x86-32 NaCl on Mac OS X.
368 '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe', 368 '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe',
369 '<(PRODUCT_DIR)/nacl_ipc_irt_x86_32.nexe', 369 '<(PRODUCT_DIR)/nacl_irt_srpc_x86_32.nexe',
370 ], 370 ],
371 }], 371 }],
372 ], 372 ],
373 }, 373 },
374 { 374 {
375 'destination': '<(PRODUCT_DIR)/$(CONTENTS_FOLDER_PATH)/Interne t Plug-Ins/PepperFlash', 375 'destination': '<(PRODUCT_DIR)/$(CONTENTS_FOLDER_PATH)/Interne t Plug-Ins/PepperFlash',
376 'files': [], 376 'files': [],
377 'conditions': [ 377 'conditions': [
378 ['branding == "Chrome"', { 378 ['branding == "Chrome"', {
379 'files': [ 379 'files': [
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
494 ], 494 ],
495 }], 495 }],
496 ], # conditions 496 ], # conditions
497 }], # OS=="mac" 497 }], # OS=="mac"
498 ], # conditions 498 ], # conditions
499 }, # target chrome_dll 499 }, # target chrome_dll
500 ], # targets 500 ], # targets
501 }], # OS=="mac" or OS=="win" 501 }], # OS=="mac" or OS=="win"
502 ], 502 ],
503 } 503 }
OLDNEW
« no previous file with comments | « chrome/browser/nacl_host/nacl_browser.cc ('k') | chrome/chrome_installer.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698