summaryrefslogtreecommitdiffstats
path: root/device/device_tests.gyp
diff options
context:
space:
mode:
Diffstat (limited to 'device/device_tests.gyp')
-rw-r--r--device/device_tests.gyp11
1 files changed, 6 insertions, 5 deletions
diff --git a/device/device_tests.gyp b/device/device_tests.gyp
index 4503e12..c4ad2d8 100644
--- a/device/device_tests.gyp
+++ b/device/device_tests.gyp
@@ -12,6 +12,7 @@
'type': '<(gtest_target_type)',
'dependencies': [
'../base/base.gyp:test_support_base',
+ '../mojo/mojo_base.gyp:mojo_url_type_converters',
'../mojo/mojo_base.gyp:mojo_environment_chromium',
'../mojo/mojo_edk.gyp:mojo_system_impl',
'../mojo/mojo_public.gyp:mojo_cpp_bindings',
@@ -24,10 +25,10 @@
'bluetooth/bluetooth.gyp:device_bluetooth_mocks',
'core/core.gyp:device_core',
'core/core.gyp:device_core_mocks',
- 'devices_app/devices_app.gyp:devices_app_lib',
'nfc/nfc.gyp:device_nfc',
'usb/usb.gyp:device_usb',
'usb/usb.gyp:device_usb_mocks',
+ 'usb/usb.gyp:device_usb_mojo_bindings',
'hid/hid.gyp:device_hid',
'hid/hid.gyp:device_hid_mocks',
'serial/serial.gyp:device_serial',
@@ -61,10 +62,6 @@
'bluetooth/test/bluetooth_test_win.cc',
'bluetooth/test/test_bluetooth_adapter_observer.cc',
'bluetooth/test/test_bluetooth_adapter_observer.h',
- 'devices_app/usb/device_impl_unittest.cc',
- 'devices_app/usb/device_manager_impl_unittest.cc',
- 'devices_app/usb/fake_permission_provider.cc',
- 'devices_app/usb/fake_permission_provider.h',
'hid/hid_connection_unittest.cc',
'hid/hid_device_filter_unittest.cc',
'hid/hid_report_descriptor_unittest.cc',
@@ -82,6 +79,10 @@
'test/test_device_client.cc',
'test/test_device_client.h',
'test/usb_test_gadget_impl.cc',
+ 'usb/mojo/device_impl_unittest.cc',
+ 'usb/mojo/device_manager_impl_unittest.cc',
+ 'usb/mojo/fake_permission_provider.cc',
+ 'usb/mojo/fake_permission_provider.h',
'usb/usb_descriptors_unittest.cc',
'usb/usb_device_filter_unittest.cc',
'usb/usb_device_handle_unittest.cc',