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

Side by Side Diff: chrome/chrome_dll.gypi

Issue 6927015: NaCl: Add the integrated runtime (IRT) library to install images (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 7 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 | « no previous file | 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) 2010 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2010 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 'target_defaults': { 5 'target_defaults': {
6 'variables': { 6 'variables': {
7 'chrome_dll_target': 0, 7 'chrome_dll_target': 0,
8 }, 8 },
9 'target_conditions': [ 9 'target_conditions': [
10 ['chrome_dll_target==1', { 10 ['chrome_dll_target==1', {
(...skipping 459 matching lines...) Expand 10 before | Expand all | Expand 10 after
470 ], 470 ],
471 }], 471 }],
472 ['internal_pdf', { 472 ['internal_pdf', {
473 'files': [ 473 'files': [
474 '<(PRODUCT_DIR)/PDF.plugin', 474 '<(PRODUCT_DIR)/PDF.plugin',
475 ], 475 ],
476 }], 476 }],
477 ['disable_nacl!=1', { 477 ['disable_nacl!=1', {
478 'files': [ 478 'files': [
479 '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.plugin', 479 '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.plugin',
480 # We leave out nacl_irt_x86_64.nexe because we only
481 # support x86-32 NaCl on Mac OS X.
482 '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe',
480 ], 483 ],
481 }], 484 }],
482 ], 485 ],
483 }, 486 },
484 { 487 {
485 'destination': '<(PRODUCT_DIR)', 488 'destination': '<(PRODUCT_DIR)',
486 'files': [ 489 'files': [
487 '<(INTERMEDIATE_DIR)/repack/resources.pak' 490 '<(INTERMEDIATE_DIR)/repack/resources.pak'
488 ], 491 ],
489 }, 492 },
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
643 'LinkIncremental': '<(msvs_debug_link_nonincremental)', 646 'LinkIncremental': '<(msvs_debug_link_nonincremental)',
644 }, 647 },
645 }, 648 },
646 }, 649 },
647 }, 650 },
648 }, # target chrome_dll 651 }, # target chrome_dll
649 ], 652 ],
650 }], 653 }],
651 ], 654 ],
652 } 655 }
OLDNEW
« no previous file with comments | « no previous file | chrome/chrome_installer.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698