media/media.gyp - Issue 12843015: Add MODIFY_AUDIO_SETTINGS permission in Android manifest and implementation in android audio manage…

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified 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 side-by-side diff with in-line comments

Download patch

Index: media/media.gyp

===================================================================

--- media/media.gyp (revision 189208)

+++ media/media.gyp (working copy)

@@ -1409,12 +1409,13 @@

'includes': [ '../build/jar_file_jni_generator.gypi' ],

{

- 'target_name': 'player_android_jni_headers',

+ 'target_name': 'media_android_jni_headers',

'type': 'none',

'dependencies': [

'media_player_jni_headers',

'sources': [

+ 'base/android/java/src/org/chromium/media/AudioManagerAndroid.java',

'base/android/java/src/org/chromium/media/MediaPlayerBridge.java',

'base/android/java/src/org/chromium/media/MediaPlayerListener.java',

@@ -1467,9 +1468,9 @@

'dependencies': [

'../base/base.gyp:base',

+ 'media_android_jni_headers',

'media_codec_jni_headers',

'media_format_jni_headers',

- 'player_android_jni_headers',

'include_dirs': [

'<(SHARED_INTERMEDIATE_DIR)/media',

« no previous file with comments | « media/base/android/media_jni_registrar.cc ('k') | testing/android/AndroidManifest.xml » ('j') | no next file with comments »