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

Side by Side Diff: media/media.gyp

Issue 12843015: Add MODIFY_AUDIO_SETTINGS permission in Android manifest and implementation in android audio manage… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: 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 | Annotate | Revision Log
« 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 cras (ChromeOS audio) library. 8 # Override to dynamically link the cras (ChromeOS audio) library.
9 'use_cras%': 0, 9 'use_cras%': 0,
10 'conditions': [ 10 'conditions': [
(...skipping 1391 matching lines...) Expand 10 before | Expand all | Expand 10 after
1402 { 1402 {
1403 'target_name': 'media_player_jni_headers', 1403 'target_name': 'media_player_jni_headers',
1404 'type': 'none', 1404 'type': 'none',
1405 'variables': { 1405 'variables': {
1406 'jni_gen_package': 'media', 1406 'jni_gen_package': 'media',
1407 'input_java_class': 'android/media/MediaPlayer.class', 1407 'input_java_class': 'android/media/MediaPlayer.class',
1408 }, 1408 },
1409 'includes': [ '../build/jar_file_jni_generator.gypi' ], 1409 'includes': [ '../build/jar_file_jni_generator.gypi' ],
1410 }, 1410 },
1411 { 1411 {
1412 'target_name': 'player_android_jni_headers', 1412 'target_name': 'media_android_jni_headers',
1413 'type': 'none', 1413 'type': 'none',
1414 'dependencies': [ 1414 'dependencies': [
1415 'media_player_jni_headers', 1415 'media_player_jni_headers',
1416 ], 1416 ],
1417 'sources': [ 1417 'sources': [
1418 'base/android/java/src/org/chromium/media/AudioManagerAndroid.java',
1418 'base/android/java/src/org/chromium/media/MediaPlayerBridge.java', 1419 'base/android/java/src/org/chromium/media/MediaPlayerBridge.java',
1419 'base/android/java/src/org/chromium/media/MediaPlayerListener.java', 1420 'base/android/java/src/org/chromium/media/MediaPlayerListener.java',
1420 ], 1421 ],
1421 'variables': { 1422 'variables': {
1422 'jni_gen_package': 'media', 1423 'jni_gen_package': 'media',
1423 }, 1424 },
1424 'includes': [ '../build/jni_generator.gypi' ], 1425 'includes': [ '../build/jni_generator.gypi' ],
1425 }, 1426 },
1426 { 1427 {
1427 'target_name': 'video_capture_android_jni_headers', 1428 'target_name': 'video_capture_android_jni_headers',
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
1460 'base/android/media_codec_bridge.h', 1461 'base/android/media_codec_bridge.h',
1461 'base/android/media_jni_registrar.cc', 1462 'base/android/media_jni_registrar.cc',
1462 'base/android/media_jni_registrar.h', 1463 'base/android/media_jni_registrar.h',
1463 'base/android/media_player_bridge.cc', 1464 'base/android/media_player_bridge.cc',
1464 'base/android/media_player_bridge.h', 1465 'base/android/media_player_bridge.h',
1465 'base/android/media_player_listener.cc', 1466 'base/android/media_player_listener.cc',
1466 'base/android/media_player_listener.h', 1467 'base/android/media_player_listener.h',
1467 ], 1468 ],
1468 'dependencies': [ 1469 'dependencies': [
1469 '../base/base.gyp:base', 1470 '../base/base.gyp:base',
1471 'media_android_jni_headers',
1470 'media_codec_jni_headers', 1472 'media_codec_jni_headers',
1471 'media_format_jni_headers', 1473 'media_format_jni_headers',
1472 'player_android_jni_headers',
1473 ], 1474 ],
1474 'include_dirs': [ 1475 'include_dirs': [
1475 '<(SHARED_INTERMEDIATE_DIR)/media', 1476 '<(SHARED_INTERMEDIATE_DIR)/media',
1476 ], 1477 ],
1477 }, 1478 },
1478 { 1479 {
1479 'target_name': 'media_java', 1480 'target_name': 'media_java',
1480 'type': 'none', 1481 'type': 'none',
1481 'dependencies': [ 1482 'dependencies': [
1482 '../base/base.gyp:base', 1483 '../base/base.gyp:base',
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
1627 ], 1628 ],
1628 'sources': [ 1629 'sources': [
1629 'base/simd/sinc_resampler_sse.cc', 1630 'base/simd/sinc_resampler_sse.cc',
1630 'base/simd/vector_math_sse.cc', 1631 'base/simd/vector_math_sse.cc',
1631 ], 1632 ],
1632 }, # end of target media_sse 1633 }, # end of target media_sse
1633 ], 1634 ],
1634 }], 1635 }],
1635 ], 1636 ],
1636 } 1637 }
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