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

Side by Side Diff: media/media.gyp

Issue 12571006: Add MODIFY_AUDIO_SETTINGS permission in Android manifest and implementation in audio manager. (Closed) Base URL: https://src.chromium.org/svn/trunk/src/
Patch Set: address some Tommi's comments Created 7 years, 9 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
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 PulseAudio library. 8 # Override to dynamically link the PulseAudio library.
9 'use_pulseaudio%': 0, 9 'use_pulseaudio%': 0,
10 # Override to dynamically link the cras (ChromeOS audio) library. 10 # Override to dynamically link the cras (ChromeOS audio) library.
(...skipping 535 matching lines...) Expand 10 before | Expand all | Expand 10 after
546 ], 546 ],
547 'link_settings': { 547 'link_settings': {
548 'libraries': [ 548 'libraries': [
549 '-lOpenSLES', 549 '-lOpenSLES',
550 ], 550 ],
551 }, 551 },
552 'include_dirs': [ 552 'include_dirs': [
553 '<(SHARED_INTERMEDIATE_DIR)/media', 553 '<(SHARED_INTERMEDIATE_DIR)/media',
554 ], 554 ],
555 'dependencies': [ 555 'dependencies': [
556 'audio_manager_android_jni_headers',
556 'video_capture_android_jni_headers', 557 'video_capture_android_jni_headers',
557 ], 558 ],
558 }], 559 }],
559 # A simple WebM encoder for animated avatars on ChromeOS. 560 # A simple WebM encoder for animated avatars on ChromeOS.
560 ['chromeos==1', { 561 ['chromeos==1', {
561 'dependencies': [ 562 'dependencies': [
562 '../third_party/libvpx/libvpx.gyp:libvpx', 563 '../third_party/libvpx/libvpx.gyp:libvpx',
563 '../third_party/libyuv/libyuv.gyp:libyuv', 564 '../third_party/libyuv/libyuv.gyp:libyuv',
564 ], 565 ],
565 'sources': [ 566 'sources': [
(...skipping 863 matching lines...) Expand 10 before | Expand all | Expand 10 after
1429 'target_name': 'camera_jni_headers', 1430 'target_name': 'camera_jni_headers',
1430 'type': 'none', 1431 'type': 'none',
1431 'variables': { 1432 'variables': {
1432 'jni_gen_package': 'media', 1433 'jni_gen_package': 'media',
1433 'input_java_class': 'android/hardware/Camera.class', 1434 'input_java_class': 'android/hardware/Camera.class',
1434 'input_jar_file': '<(android_sdk)/android.jar', 1435 'input_jar_file': '<(android_sdk)/android.jar',
1435 }, 1436 },
1436 'includes': [ '../build/jar_file_jni_generator.gypi' ], 1437 'includes': [ '../build/jar_file_jni_generator.gypi' ],
1437 }, 1438 },
1438 { 1439 {
1440 'target_name': 'audio_manager_android_jni_headers',
1441 'type': 'none',
1442 'sources': [
1443 'base/android/java/src/org/chromium/media/AudioManagerAndroid.java',
1444 ],
1445 'variables': {
1446 'jni_gen_package': 'media',
1447 },
1448 'includes': [ '../build/jni_generator.gypi' ],
1449 },
1450 {
1439 'target_name': 'video_capture_android_jni_headers', 1451 'target_name': 'video_capture_android_jni_headers',
1440 'type': 'none', 1452 'type': 'none',
1441 'dependencies': [ 1453 'dependencies': [
1442 'camera_jni_headers', 1454 'camera_jni_headers',
1443 ], 1455 ],
1444 'sources': [ 1456 'sources': [
1445 'base/android/java/src/org/chromium/media/VideoCapture.java', 1457 'base/android/java/src/org/chromium/media/VideoCapture.java',
1446 ], 1458 ],
1447 'variables': { 1459 'variables': {
1448 'jni_gen_package': 'media', 1460 'jni_gen_package': 'media',
(...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after
1644 ], 1656 ],
1645 'sources': [ 1657 'sources': [
1646 'base/simd/sinc_resampler_sse.cc', 1658 'base/simd/sinc_resampler_sse.cc',
1647 'base/simd/vector_math_sse.cc', 1659 'base/simd/vector_math_sse.cc',
1648 ], 1660 ],
1649 }, # end of target media_sse 1661 }, # end of target media_sse
1650 ], 1662 ],
1651 }], 1663 }],
1652 ], 1664 ],
1653 } 1665 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698