Index: media/media.gyp |
diff --git a/media/media.gyp b/media/media.gyp |
index 17447e56b0239a032a2a94c7f560269c4c1aa40b..4f2d2555618700d123a97bfcd02c779ddb7d81a5 100644 |
--- a/media/media.gyp |
+++ b/media/media.gyp |
@@ -682,6 +682,7 @@ |
'audio/win/audio_output_win_unittest.cc', |
'audio/win/audio_unified_win_unittest.cc', |
'audio/win/core_audio_util_win_unittest.cc', |
+ 'base/android/media_codec_bridge_unittest.cc', |
'base/audio_bus_unittest.cc', |
'base/audio_converter_unittest.cc', |
'base/audio_fifo_unittest.cc', |
@@ -805,6 +806,7 @@ |
['gtest_target_type == "shared_library"', { |
'dependencies': [ |
'../testing/android/native_test.gyp:native_test_native_code', |
+ 'player_android', |
], |
}], |
], |
@@ -1243,9 +1245,31 @@ |
'includes': [ '../build/jni_generator.gypi' ], |
}, |
{ |
+ 'target_name': 'media_codec_jni_headers', |
+ 'type': 'none', |
+ 'variables': { |
+ 'jni_gen_dir': 'media', |
+ 'input_java_class': 'android/media/MediaCodec.class', |
+ 'input_jar_file': '<(android_sdk)/android.jar', |
+ }, |
+ 'includes': [ '../build/jar_file_jni_generator.gypi' ], |
+ }, |
+ { |
+ 'target_name': 'media_format_jni_headers', |
+ 'type': 'none', |
+ 'variables': { |
+ 'jni_gen_dir': 'media', |
+ 'input_java_class': 'android/media/MediaFormat.class', |
+ 'input_jar_file': '<(android_sdk)/android.jar', |
+ }, |
+ 'includes': [ '../build/jar_file_jni_generator.gypi' ], |
+ }, |
+ { |
'target_name': 'player_android', |
'type': 'static_library', |
'sources': [ |
+ 'base/android/media_codec_bridge.cc', |
+ 'base/android/media_codec_bridge.h', |
'base/android/media_jni_registrar.cc', |
'base/android/media_jni_registrar.h', |
'base/android/media_player_bridge.cc', |
@@ -1255,6 +1279,8 @@ |
], |
'dependencies': [ |
'../base/base.gyp:base', |
+ 'media_codec_jni_headers', |
+ 'media_format_jni_headers', |
'player_android_jni_headers', |
], |
'include_dirs': [ |