diff options
| author | jfroy <jfroy@chromium.org> | 2014-09-08 13:41:44 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-08 20:46:43 +0000 |
| commit | dba29b0688ad137a4e482ef4347469df85883a8b (patch) | |
| tree | 845ba80b08a6e9758d8988c632c9f93c8c84f2f4 /media/media.gyp | |
| parent | 817ca9b5c2145d843f6ff154926db79535974778 (diff) | |
| download | chromium_src-dba29b0688ad137a4e482ef4347469df85883a8b.zip chromium_src-dba29b0688ad137a4e482ef4347469df85883a8b.tar.gz chromium_src-dba29b0688ad137a4e482ef4347469df85883a8b.tar.bz2 | |
Include Mac media glue code in iOS builds.
BUG=410527
R=rsesek, DaleCurtis
Review URL: https://codereview.chromium.org/533423002
Cr-Commit-Position: refs/heads/master@{#293782}
Diffstat (limited to 'media/media.gyp')
| -rw-r--r-- | media/media.gyp | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/media/media.gyp b/media/media.gyp index 197c153..5fb0366 100644 --- a/media/media.gyp +++ b/media/media.gyp @@ -988,7 +988,19 @@ 'base/keyboard_event_counter.h', ], }], - ], + ], # conditions + 'target_conditions': [ + ['OS == "ios" and _toolset != "host"', { + 'sources/': [ + # Pull in specific Mac files for iOS (which have been filtered out + # by file name rules). + ['include', '^base/mac/avfoundation_glue\\.h$'], + ['include', '^base/mac/avfoundation_glue\\.mm$'], + ['include', '^base/mac/coremedia_glue\\.h$'], + ['include', '^base/mac/coremedia_glue\\.mm$'], + ], + }], + ], # target_conditions }, { # GN version: //media/mojo/interfaces |