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

Side by Side Diff: media/media.gyp

Issue 13577006: Android: Fix build breakage caused by r192880 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 8 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 | no next file » | 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 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 # Override to dynamically link the cras (ChromeOS audio) library. 8 # Override to dynamically link the cras (ChromeOS audio) library.
9 'use_cras%': 0, 9 'use_cras%': 0,
10 # Option e.g. for Linux distributions to link pulseaudio directly 10 # Option e.g. for Linux distributions to link pulseaudio directly
(...skipping 556 matching lines...) Expand 10 before | Expand all | Expand 10 after
567 'link_settings': { 567 'link_settings': {
568 'libraries': [ 568 'libraries': [
569 '-lOpenSLES', 569 '-lOpenSLES',
570 ], 570 ],
571 }, 571 },
572 'include_dirs': [ 572 'include_dirs': [
573 '<(SHARED_INTERMEDIATE_DIR)/media', 573 '<(SHARED_INTERMEDIATE_DIR)/media',
574 ], 574 ],
575 'dependencies': [ 575 'dependencies': [
576 'media_android_jni_headers', 576 'media_android_jni_headers',
577 'player_android',
577 'video_capture_android_jni_headers', 578 'video_capture_android_jni_headers',
578 ], 579 ],
579 }], 580 }],
580 # A simple WebM encoder for animated avatars on ChromeOS. 581 # A simple WebM encoder for animated avatars on ChromeOS.
581 ['chromeos==1', { 582 ['chromeos==1', {
582 'dependencies': [ 583 'dependencies': [
583 '../third_party/libvpx/libvpx.gyp:libvpx', 584 '../third_party/libvpx/libvpx.gyp:libvpx',
584 '../third_party/libyuv/libyuv.gyp:libyuv', 585 '../third_party/libyuv/libyuv.gyp:libyuv',
585 ], 586 ],
586 'sources': [ 587 'sources': [
(...skipping 1075 matching lines...) Expand 10 before | Expand all | Expand 10 after
1662 ], 1663 ],
1663 'sources': [ 1664 'sources': [
1664 'base/simd/sinc_resampler_sse.cc', 1665 'base/simd/sinc_resampler_sse.cc',
1665 'base/simd/vector_math_sse.cc', 1666 'base/simd/vector_math_sse.cc',
1666 ], 1667 ],
1667 }, # end of target media_sse 1668 }, # end of target media_sse
1668 ], 1669 ],
1669 }], 1670 }],
1670 ], 1671 ],
1671 } 1672 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698