| Index: media/media.gyp
|
| diff --git a/media/media.gyp b/media/media.gyp
|
| index a084ab67716dbfc180694e34fbd1cb7811dba3bb..4bee26290cfa893905374f9d66f2a4546523efa6 100644
|
| --- a/media/media.gyp
|
| +++ b/media/media.gyp
|
| @@ -937,6 +937,7 @@
|
| ],
|
| 'dependencies': [
|
| '../base/base.gyp:base',
|
| + 'media_java',
|
| ],
|
| 'include_dirs': [
|
| '<(SHARED_INTERMEDIATE_DIR)/media',
|
| @@ -961,6 +962,17 @@
|
| },
|
| ],
|
| },
|
| + {
|
| + 'target_name': 'media_java',
|
| + 'type': 'none',
|
| + 'dependencies': [ '../base/base.gyp:base_java' ],
|
| + 'variables': {
|
| + 'package_name': 'media',
|
| + 'java_in_dir': 'base/android/java',
|
| + },
|
| + 'includes': [ '../build/java.gypi' ],
|
| + },
|
| +
|
| ],
|
| }, { # OS != "android"'
|
| # Android does not use ffmpeg, so disable the targets which require it.
|
|
|