Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1632)

Unified Diff: media/media.gyp

Issue 533423002: Include Mac media glue code in iOS builds. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@base-glue
Patch Set: Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/BUILD.gn ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/media.gyp
diff --git a/media/media.gyp b/media/media.gyp
index a777ef8be6e1a9bfceb50eafdcfcaefbf368b2e5..cbead302067e51bbbf94eecad65eb35627318c7f 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -988,7 +988,17 @@
'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|mm)$'],
DaleCurtis 2014/09/04 23:05:03 Please list these explicitly. These type of patter
jfroy 2014/09/05 16:06:36 Done.
+ ['include', '^base/mac/coremedia_glue\\.(h|mm)$'],
+ ],
+ }],
+ ], # target_conditions
},
{
# GN version: //media:media_unittests
« no previous file with comments | « media/BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698