| Index: media/media.gyp
|
| diff --git a/media/media.gyp b/media/media.gyp
|
| index 17447e56b0239a032a2a94c7f560269c4c1aa40b..65eb1cf1265142413d1808258e3b568d2c93ad0b 100644
|
| --- a/media/media.gyp
|
| +++ b/media/media.gyp
|
| @@ -801,10 +801,14 @@
|
| 'mp4/mp4_stream_parser_unittest.cc',
|
| 'webm/webm_cluster_parser_unittest.cc',
|
| ],
|
| + 'sources': [
|
| + 'base/android/media_codec_bridge_unittest.cc',
|
| + ],
|
| 'conditions': [
|
| ['gtest_target_type == "shared_library"', {
|
| 'dependencies': [
|
| '../testing/android/native_test.gyp:native_test_native_code',
|
| + 'player_android',
|
| ],
|
| }],
|
| ],
|
| @@ -1243,18 +1247,59 @@
|
| 'includes': [ '../build/jni_generator.gypi' ],
|
| },
|
| {
|
| + 'target_name': 'buffer_jni_headers',
|
| + 'type': 'none',
|
| + 'variables': {
|
| + 'jni_gen_dir': 'media',
|
| + 'input_java_class': 'java/nio/Buffer.class',
|
| + 'input_jar_file': '<(android_sdk)/android.jar',
|
| + },
|
| + 'includes': [ '../build/jar_file_jni_generator.gypi' ],
|
| + },
|
| + {
|
| + 'target_name': 'byte_buffer_jni_headers',
|
| + 'type': 'none',
|
| + 'variables': {
|
| + 'jni_gen_dir': 'media',
|
| + 'input_java_class': 'java/nio/ByteBuffer.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',
|
| 'base/android/media_player_bridge.h',
|
| 'base/android/media_player_listener.cc',
|
| 'base/android/media_player_listener.h',
|
| + # TODO(dwkang) : make jar_file_jni_generator support the array
|
| + # return type (MediaCodec) and inner class (MediaCodec$BufferInfo)
|
| + # and remove the following jni files from here.
|
| + # Intoducing a helper java class can also be an alternative.
|
| + 'base/android/MediaCodec_jni.h',
|
| + 'base/android/MediaCodec$BufferInfo_jni.h',
|
| ],
|
| 'dependencies': [
|
| '../base/base.gyp:base',
|
| + 'buffer_jni_headers',
|
| + 'byte_buffer_jni_headers',
|
| + 'media_format_jni_headers',
|
| 'player_android_jni_headers',
|
| ],
|
| 'include_dirs': [
|
|
|