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

Side by Side Diff: chrome/chrome_exe.gypi

Issue 12237003: Renaming the CdmWrapper build targets. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Wording change Created 7 years, 10 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/chrome_dll_bundle.gypi ('k') | content/browser/media/encrypted_media_browsertest.cc » ('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 { 5 {
6 'targets': [ 6 'targets': [
7 { 7 {
8 'target_name': 'chrome', 8 'target_name': 'chrome',
9 'type': 'executable', 9 'type': 'executable',
10 'mac_bundle': 1, 10 'mac_bundle': 1,
(...skipping 409 matching lines...) Expand 10 before | Expand all | Expand 10 after
420 'dependencies': [ 420 'dependencies': [
421 'chrome_resources.gyp:packed_extra_resources', 421 'chrome_resources.gyp:packed_extra_resources',
422 'chrome_resources.gyp:packed_resources', 422 'chrome_resources.gyp:packed_resources',
423 # Copy Flash Player files to PRODUCT_DIR if applicable. Let the .gyp 423 # Copy Flash Player files to PRODUCT_DIR if applicable. Let the .gyp
424 # file decide what to do on a per-OS basis; on Mac, internal plugins 424 # file decide what to do on a per-OS basis; on Mac, internal plugins
425 # go inside the framework, so this dependency is in chrome_dll.gypi. 425 # go inside the framework, so this dependency is in chrome_dll.gypi.
426 '../third_party/adobe/flash/flash_player.gyp:flapper_binaries', 426 '../third_party/adobe/flash/flash_player.gyp:flapper_binaries',
427 # Copy CDM files to PRODUCT_DIR if applicable. Let the .gyp 427 # Copy CDM files to PRODUCT_DIR if applicable. Let the .gyp
428 # file decide what to do on a per-OS basis; on Mac, internal plugins 428 # file decide what to do on a per-OS basis; on Mac, internal plugins
429 # go inside the framework, so this dependency is in chrome_dll.gypi. 429 # go inside the framework, so this dependency is in chrome_dll.gypi.
430 '../third_party/widevine/cdm/widevine_cdm.gyp:widevinecdmplugin', 430 '../third_party/widevine/cdm/widevine_cdm.gyp:widevinecdmadapter',
431 ], 431 ],
432 }], 432 }],
433 ['OS=="mac" and asan==1', { 433 ['OS=="mac" and asan==1', {
434 'xcode_settings': { 434 'xcode_settings': {
435 # Override the outer definition of CHROMIUM_STRIP_SAVE_FILE. 435 # Override the outer definition of CHROMIUM_STRIP_SAVE_FILE.
436 'CHROMIUM_STRIP_SAVE_FILE': 'app/app_asan.saves', 436 'CHROMIUM_STRIP_SAVE_FILE': 'app/app_asan.saves',
437 }, 437 },
438 }], 438 }],
439 ['OS=="linux"', { 439 ['OS=="linux"', {
440 'conditions': [ 440 'conditions': [
(...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after
603 'target_name': 'chrome_nacl_win64', 603 'target_name': 'chrome_nacl_win64',
604 'type': 'none', 604 'type': 'none',
605 'sources': [], 605 'sources': [],
606 }, 606 },
607 ], 607 ],
608 }], 608 }],
609 ], 609 ],
610 }], 610 }],
611 ], 611 ],
612 } 612 }
OLDNEW
« no previous file with comments | « chrome/chrome_dll_bundle.gypi ('k') | content/browser/media/encrypted_media_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698