Revert 191287 "Revert 189210 "Add MODIFY_AUDIO_SETTINGS permissi..."

media/media.gyp

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     'chromium_code': 1,
     # Override to dynamically link the cras (ChromeOS audio) library.
     'use_cras%': 0,
     'conditions': [
@@ skipping 1394 matching lines @@
          {
           'target_name': 'media_player_jni_headers',
           'type': 'none',
           'variables': {
             'jni_gen_package': 'media',
             'input_java_class': 'android/media/MediaPlayer.class',
           },
           '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',
           ],
           'variables': {
             'jni_gen_package': 'media',
           },
           'includes': [ '../build/jni_generator.gypi' ],
         },
         {
           'target_name': 'video_capture_android_jni_headers',
@@ skipping 32 matching lines @@
             'base/android/media_codec_bridge.h',
             'base/android/media_jni_registrar.cc',
             'base/android/media_jni_registrar.h',
             'base/android/media_player_bridge.cc',
             'base/android/media_player_bridge.h',
             'base/android/media_player_listener.cc',
             'base/android/media_player_listener.h',
           ],
           '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',
           ],
         },
         {
           'target_name': 'media_java',
           'type': 'none',
           'dependencies': [
             '../base/base.gyp:base',
@@ skipping 144 matching lines @@
           ],
           'sources': [
             'base/simd/sinc_resampler_sse.cc',
             'base/simd/vector_math_sse.cc',
           ],
         }, # end of target media_sse
       ],
     }],
   ],
 }