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

Unified Diff: chrome/browser/media/router/media_router.gyp

Issue 1228863005: [MediaRouter] The minimal change to make everything build on Android. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed the include for MediaRouterDialogControllerImpl Created 5 years, 5 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
Index: chrome/browser/media/router/media_router.gyp
diff --git a/chrome/browser/media/router/media_router.gyp b/chrome/browser/media/router/media_router.gyp
index 507427e5e7261e88be5b51412142b4092bd823f9..186c74977698c79d53fb038488dbb0969e1fc7d1 100644
--- a/chrome/browser/media/router/media_router.gyp
+++ b/chrome/browser/media/router/media_router.gyp
@@ -13,23 +13,34 @@
'type': 'static_library',
'include_dirs': [
'<(DEPTH)',
- '<(DEPTH)/third_party/mojo/src',
],
'dependencies': [
- # media_router_type_converters.h needs the generated file.
- 'media_router_mojo_gen',
- 'media_router_mojo',
'<(DEPTH)/base/base.gyp:base',
'<(DEPTH)/chrome/common_constants.gyp:common_constants',
'<(DEPTH)/components/components.gyp:keyed_service_content',
'<(DEPTH)/components/components.gyp:keyed_service_core',
- '<(DEPTH)/extensions/extensions.gyp:extensions_browser',
'<(DEPTH)/skia/skia.gyp:skia',
'<(DEPTH)/url/url.gyp:url_lib',
],
'sources': [
'<@(media_router_sources)',
],
+ 'conditions': [
+ [ 'OS!="android" and OS!="ios"', {
+ 'include_dirs': [
+ '<(DEPTH)/third_party/mojo/src',
+ ],
+ 'dependencies': [
+ # media_router_type_converters.h needs the generated file.
+ 'media_router_mojo_gen',
+ 'media_router_mojo',
+ '<(DEPTH)/extensions/extensions.gyp:extensions_browser',
+ ],
+ 'sources': [
+ '<@(media_router_non_android_sources)',
+ ]
+ }],
+ ]
},
{
# Mojo compiler for the Media Router internal API.

Powered by Google App Engine
This is Rietveld 408576698