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

Unified Diff: chrome/chrome_tests_unit.gypi

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/chrome_tests_unit.gypi
diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi
index 6c9a96f1747e0b3aac290c21cad9ec89952dcfce..dd04a16828b8e5e55bc0f3857d3b770a4dd9d8ff 100644
--- a/chrome/chrome_tests_unit.gypi
+++ b/chrome/chrome_tests_unit.gypi
@@ -1462,16 +1462,18 @@
'browser/media/router/issue_manager_unittest.cc',
'browser/media/router/issue_unittest.cc',
'browser/media/router/media_route_unittest.cc',
- 'browser/media/router/media_router_mojo_impl_unittest.cc',
- 'browser/media/router/media_router_type_converters_unittest.cc',
'browser/media/router/media_sink_unittest.cc',
'browser/media/router/media_source_helper_unittest.cc',
'browser/media/router/media_source_unittest.cc',
'browser/media/router/presentation_media_sinks_observer_unittest.cc',
'browser/media/router/presentation_service_delegate_impl_unittest.cc',
'browser/media/router/presentation_session_state_observer_unittest.cc',
+ ],
+ 'chrome_unit_tests_media_router_non_android_sources': [
+ 'browser/media/router/media_router_mojo_impl_unittest.cc',
+ 'browser/media/router/media_router_type_converters_unittest.cc',
'browser/ui/webui/media_router/media_cast_mode_unittest.cc',
- 'browser/ui/webui/media_router/media_router_dialog_controller_unittest.cc',
+ 'browser/ui/webui/media_router/media_router_dialog_controller_impl_unittest.cc',
'browser/ui/webui/media_router/media_router_test.cc',
'browser/ui/webui/media_router/media_router_test.h',
'browser/ui/webui/media_router/media_router_webui_message_handler_unittest.cc',
@@ -2434,6 +2436,11 @@
['enable_media_router==1', {
'sources': [ '<@(chrome_unit_tests_media_router_sources)' ],
'dependencies': [ 'browser/media/router/media_router.gyp:media_router_test_support' ],
+ 'conditions': [
+ ['OS!="android"', {
+ 'sources': [ '<@(chrome_unit_tests_media_router_non_android_sources)' ],
+ }],
+ ],
}],
['enable_captive_portal_detection==1', {
'sources': [ '<@(chrome_unit_tests_captive_portal_sources)' ],

Powered by Google App Engine
This is Rietveld 408576698