Index: trunk/src/media/media.gyp |
=================================================================== |
--- trunk/src/media/media.gyp (revision 217773) |
+++ trunk/src/media/media.gyp (working copy) |
@@ -304,11 +304,6 @@ |
'base/stream_parser_buffer.cc', |
'base/stream_parser_buffer.h', |
'base/text_track.h', |
- 'base/user_input_monitor.cc', |
- 'base/user_input_monitor.h', |
- 'base/user_input_monitor_linux.cc', |
- 'base/user_input_monitor_mac.mm', |
- 'base/user_input_monitor_win.cc', |
'base/video_decoder.cc', |
'base/video_decoder.h', |
'base/video_decoder_config.cc', |
@@ -546,7 +541,6 @@ |
['include', '^base/media\\.cc$'], |
['include', '^base/media_stub\\.cc$'], |
['include', '^base/media_switches\\.'], |
- ['include', '^base/user_input_monitor\\.'], |
['include', '^base/vector_math\\.'], |
], |
'link_settings': { |
@@ -557,9 +551,6 @@ |
'$(SDKROOT)/System/Library/Frameworks/CoreMIDI.framework', |
], |
}, |
- 'defines': [ |
- 'DISABLE_USER_INPUT_MONITOR', |
- ], |
}], |
['OS=="android"', { |
'link_settings': { |
@@ -587,9 +578,6 @@ |
], |
}], |
], |
- 'defines': [ |
- 'DISABLE_USER_INPUT_MONITOR', |
- ], |
}], |
# A simple WebM encoder for animated avatars on ChromeOS. |
['chromeos==1', { |
@@ -603,15 +591,6 @@ |
'webm/chromeos/webm_encoder.cc', |
'webm/chromeos/webm_encoder.h', |
], |
- 'defines': [ |
- # TODO(jiayl): figure out why MediaStreamInfoBarTest. |
- # DenyingCameraDoesNotCauseStickyDenyForMics fails on ChromeOS and |
- # remove this. |
- 'DISABLE_USER_INPUT_MONITOR', |
- ], |
- 'sources!': [ |
- 'base/user_input_monitor_linux.cc', |
- ], |
}], |
['use_alsa==1', { |
'link_settings': { |
@@ -647,16 +626,8 @@ |
'-lXdamage', |
'-lXext', |
'-lXfixes', |
- '-lXtst', |
], |
}, |
- }, { # else: use_x11==0 |
- 'sources!': [ |
- 'base/user_input_monitor_linux.cc', |
- ], |
- 'defines': [ |
- 'DISABLE_USER_INPUT_MONITOR', |
- ], |
}], |
['use_cras==1', { |
'cflags': [ |