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

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: disable more unit tests 2 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
« no previous file with comments | « media/base/android/media_jni_registrar.cc ('k') | testing/android/AndroidManifest.xml » ('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 '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 1393 matching lines...) Expand 10 before | Expand all | Expand 10 after
1404 'target_name': 'media_player_jni_headers', 1404 'target_name': 'media_player_jni_headers',
1405 'type': 'none', 1405 'type': 'none',
1406 'variables': { 1406 'variables': {
1407 'jni_gen_package': 'media', 1407 'jni_gen_package': 'media',
1408 'input_java_class': 'android/media/MediaPlayer.class', 1408 'input_java_class': 'android/media/MediaPlayer.class',
1409 'input_jar_file': '<(android_sdk)/android.jar', 1409 'input_jar_file': '<(android_sdk)/android.jar',
1410 }, 1410 },
1411 'includes': [ '../build/jar_file_jni_generator.gypi' ], 1411 'includes': [ '../build/jar_file_jni_generator.gypi' ],
1412 }, 1412 },
1413 { 1413 {
1414 'target_name': 'player_android_jni_headers', 1414 'target_name': 'media_android_jni_headers',
1415 'type': 'none', 1415 'type': 'none',
1416 'dependencies': [ 1416 'dependencies': [
1417 'media_player_jni_headers', 1417 'media_player_jni_headers',
1418 ], 1418 ],
1419 'sources': [ 1419 'sources': [
1420 'base/android/java/src/org/chromium/media/AudioManagerAndroid.java',
1420 'base/android/java/src/org/chromium/media/MediaPlayerBridge.java', 1421 'base/android/java/src/org/chromium/media/MediaPlayerBridge.java',
1421 'base/android/java/src/org/chromium/media/MediaPlayerListener.java', 1422 'base/android/java/src/org/chromium/media/MediaPlayerListener.java',
1422 ], 1423 ],
1423 'variables': { 1424 'variables': {
1424 'jni_gen_package': 'media', 1425 'jni_gen_package': 'media',
1425 }, 1426 },
1426 'includes': [ '../build/jni_generator.gypi' ], 1427 'includes': [ '../build/jni_generator.gypi' ],
1427 }, 1428 },
1428 { 1429 {
1429 'target_name': 'video_capture_android_jni_headers', 1430 'target_name': 'video_capture_android_jni_headers',
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
1464 'base/android/media_codec_bridge.h', 1465 'base/android/media_codec_bridge.h',
1465 'base/android/media_jni_registrar.cc', 1466 'base/android/media_jni_registrar.cc',
1466 'base/android/media_jni_registrar.h', 1467 'base/android/media_jni_registrar.h',
1467 'base/android/media_player_bridge.cc', 1468 'base/android/media_player_bridge.cc',
1468 'base/android/media_player_bridge.h', 1469 'base/android/media_player_bridge.h',
1469 'base/android/media_player_listener.cc', 1470 'base/android/media_player_listener.cc',
1470 'base/android/media_player_listener.h', 1471 'base/android/media_player_listener.h',
1471 ], 1472 ],
1472 'dependencies': [ 1473 'dependencies': [
1473 '../base/base.gyp:base', 1474 '../base/base.gyp:base',
1475 'media_android_jni_headers',
1474 'media_codec_jni_headers', 1476 'media_codec_jni_headers',
1475 'media_format_jni_headers', 1477 'media_format_jni_headers',
1476 'player_android_jni_headers',
1477 ], 1478 ],
1478 'include_dirs': [ 1479 'include_dirs': [
1479 '<(SHARED_INTERMEDIATE_DIR)/media', 1480 '<(SHARED_INTERMEDIATE_DIR)/media',
1480 ], 1481 ],
1481 }, 1482 },
1482 { 1483 {
1483 'target_name': 'media_java', 1484 'target_name': 'media_java',
1484 'type': 'none', 1485 'type': 'none',
1485 'dependencies': [ 1486 'dependencies': [
1486 '../base/base.gyp:base', 1487 '../base/base.gyp:base',
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
1631 ], 1632 ],
1632 'sources': [ 1633 'sources': [
1633 'base/simd/sinc_resampler_sse.cc', 1634 'base/simd/sinc_resampler_sse.cc',
1634 'base/simd/vector_math_sse.cc', 1635 'base/simd/vector_math_sse.cc',
1635 ], 1636 ],
1636 }, # end of target media_sse 1637 }, # end of target media_sse
1637 ], 1638 ],
1638 }], 1639 }],
1639 ], 1640 ],
1640 } 1641 }
OLDNEW
« no previous file with comments | « media/base/android/media_jni_registrar.cc ('k') | testing/android/AndroidManifest.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698