diff options
| author | lukasza <lukasza@chromium.org> | 2015-03-26 15:37:20 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-03-26 22:38:03 +0000 |
| commit | a78c3daa7c5a8fc1e3e81cb42f17287c3ff601ad (patch) | |
| tree | 45c46a38f6f1a89f5ed21c43701389405b6b664f /remoting | |
| parent | 9a223da25aa8ba8ea030e673059ef5b3cbfd6b4a (diff) | |
| download | chromium_src-a78c3daa7c5a8fc1e3e81cb42f17287c3ff601ad.zip chromium_src-a78c3daa7c5a8fc1e3e81cb42f17287c3ff601ad.tar.gz chromium_src-a78c3daa7c5a8fc1e3e81cb42f17287c3ff601ad.tar.bz2 | |
Fixing building of remoting_unittests_apk target.
BUG=
Review URL: https://codereview.chromium.org/1010803014
Cr-Commit-Position: refs/heads/master@{#322482}
Diffstat (limited to 'remoting')
| -rw-r--r-- | remoting/BUILD.gn | 5 | ||||
| -rw-r--r-- | remoting/client/BUILD.gn | 6 | ||||
| -rw-r--r-- | remoting/client/plugin/BUILD.gn | 22 | ||||
| -rw-r--r-- | remoting/remoting_test.gypi | 5 |
4 files changed, 29 insertions, 9 deletions
diff --git a/remoting/BUILD.gn b/remoting/BUILD.gn index e8d6411..2fcdf64 100644 --- a/remoting/BUILD.gn +++ b/remoting/BUILD.gn @@ -113,7 +113,10 @@ if (!is_win && !is_mac) { if (is_android) { deps += [ "//testing/android:native_test_native_code" ] } else { - deps += [ "//remoting/client/plugin" ] + deps += [ + "//remoting/client/plugin", + "//remoting/client/plugin:unit_tests", + ] } if (enable_remoting_host) { diff --git a/remoting/client/BUILD.gn b/remoting/client/BUILD.gn index b47888a..ecbb86d 100644 --- a/remoting/client/BUILD.gn +++ b/remoting/client/BUILD.gn @@ -30,15 +30,9 @@ source_set("unit_tests") { "audio_player_unittest.cc", "client_status_logger_unittest.cc", "key_event_mapper_unittest.cc", - "plugin/empty_cursor_filter_unittest.cc", - "plugin/normalizing_input_filter_mac_unittest.cc", "server_log_entry_client_unittest.cc", ] - if (is_chromeos) { - sources += [ "plugin/normalizing_input_filter_cros_unittest.cc" ] - } - deps = [ ":client", "//remoting/proto", diff --git a/remoting/client/plugin/BUILD.gn b/remoting/client/plugin/BUILD.gn index 9594824..9fb1fe7 100644 --- a/remoting/client/plugin/BUILD.gn +++ b/remoting/client/plugin/BUILD.gn @@ -40,3 +40,25 @@ source_set("plugin") { "//ui/events:dom4_keycode_converter", ] } + +source_set("unit_tests") { + testonly = true + + sources = [ + "empty_cursor_filter_unittest.cc", + "normalizing_input_filter_mac_unittest.cc", + "touch_input_scaler_unittest.cc", + ] + + if (is_chromeos) { + sources += [ "normalizing_input_filter_cros_unittest.cc" ] + } + + deps = [ + ":plugin", + "//remoting/proto", + "//testing/gmock", + "//testing/gtest", + "//third_party/webrtc", + ] +} diff --git a/remoting/remoting_test.gypi b/remoting/remoting_test.gypi index e28e434..5a01d1f 100644 --- a/remoting/remoting_test.gypi +++ b/remoting/remoting_test.gypi @@ -249,8 +249,6 @@ 'protocol/ssl_hmac_channel_authenticator_unittest.cc', 'protocol/third_party_authenticator_unittest.cc', 'protocol/v2_authenticator_unittest.cc', - 'signaling/fake_signal_strategy.cc', - 'signaling/fake_signal_strategy.h', 'signaling/iq_sender_unittest.cc', 'signaling/log_to_server_unittest.cc', 'signaling/server_log_entry_unittest.cc', @@ -282,6 +280,9 @@ 'dependencies!': [ 'remoting_client_plugin', ], + 'sources/': [ + ['exclude', '^client/plugin/'], + ] }], [ 'OS=="android"', { 'dependencies': [ |