| Index: media/media.gyp
|
| ===================================================================
|
| --- media/media.gyp (revision 178068)
|
| +++ media/media.gyp (working copy)
|
| @@ -313,6 +313,8 @@
|
| 'filters/video_frame_generator.h',
|
| 'filters/video_renderer_base.cc',
|
| 'filters/video_renderer_base.h',
|
| + 'video/capture/android/video_capture_device_android.cc',
|
| + 'video/capture/android/video_capture_device_android.h',
|
| 'video/capture/fake_video_capture_device.cc',
|
| 'video/capture/fake_video_capture_device.h',
|
| 'video/capture/linux/video_capture_device_linux.cc',
|
| @@ -460,6 +462,12 @@
|
| '-lOpenSLES',
|
| ],
|
| },
|
| + 'include_dirs': [
|
| + '<(SHARED_INTERMEDIATE_DIR)/media',
|
| + ],
|
| + 'dependencies': [
|
| + 'video_capture_android_jni_headers',
|
| + ],
|
| }],
|
| # A simple WebM encoder for animated avatars on ChromeOS.
|
| ['chromeos==1', {
|
| @@ -549,9 +557,6 @@
|
| ],
|
| }],
|
| ],
|
| - }],
|
| - ['os_posix == 1 and OS != "android"', {
|
| - # Video capture isn't supported in Android yet.
|
| 'sources!': [
|
| 'video/capture/video_capture_device_dummy.cc',
|
| 'video/capture/video_capture_device_dummy.h',
|
| @@ -1241,6 +1246,17 @@
|
| 'includes': [ '../build/jni_generator.gypi' ],
|
| },
|
| {
|
| + 'target_name': 'video_capture_android_jni_headers',
|
| + 'type': 'none',
|
| + 'sources': [
|
| + 'base/android/java/src/org/chromium/media/VideoCapture.java',
|
| + ],
|
| + 'variables': {
|
| + 'jni_gen_dir': 'media',
|
| + },
|
| + 'includes': [ '../build/jni_generator.gypi' ],
|
| + },
|
| + {
|
| 'target_name': 'player_android',
|
| 'type': 'static_library',
|
| 'sources': [
|
|
|