| Index: services/device/BUILD.gn
|
| diff --git a/services/device/BUILD.gn b/services/device/BUILD.gn
|
| index 658419f0a225db43a843af5a0585f1f277819d01..9b48b9bfe8d766ff419a13c9c39d842038a8f115 100644
|
| --- a/services/device/BUILD.gn
|
| +++ b/services/device/BUILD.gn
|
| @@ -27,14 +27,13 @@ source_set("lib") {
|
| "//base",
|
| "//device/battery:mojo_bindings",
|
| "//device/generic_sensor",
|
| - "//device/sensors",
|
| - "//device/sensors/public/interfaces",
|
| "//device/wake_lock",
|
| "//services/device/fingerprint",
|
| "//services/device/power_monitor",
|
| "//services/device/public/cpp:device_features",
|
| "//services/device/public/interfaces",
|
| "//services/device/screen_orientation",
|
| + "//services/device/sensors",
|
| "//services/device/time_zone_monitor",
|
| "//services/service_manager/public/cpp",
|
| "//ui/gfx",
|
| @@ -60,6 +59,7 @@ source_set("tests") {
|
| sources = [
|
| "power_monitor/power_monitor_message_broadcaster_unittest.cc",
|
| "public/cpp/power_monitor/power_monitor_broadcast_source_unittest.cc",
|
| + "sensors/data_fetcher_shared_memory_base_unittest.cc",
|
| "sensors/device_sensor_service_unittest.cc",
|
| "vibration/vibration_manager_impl_unittest.cc",
|
| ]
|
| @@ -68,21 +68,29 @@ source_set("tests") {
|
| ":test_support",
|
| "//base",
|
| "//base/test:test_support",
|
| - "//device/sensors",
|
| - "//device/sensors/public/cpp:full",
|
| "//mojo/public/cpp/bindings",
|
| "//services/device/power_monitor",
|
| "//services/device/public/cpp/power_monitor",
|
| + "//services/device/public/cpp/sensors:full",
|
| + "//services/device/public/interfaces",
|
| + "//services/device/sensors",
|
| "//testing/gtest",
|
| ]
|
|
|
| if (is_chromeos) {
|
| - sources += [ "fingerprint/fingerprint_chromeos_unittest.cc" ]
|
| + sources += [
|
| + "fingerprint/fingerprint_chromeos_unittest.cc",
|
| + "sensors/sensor_manager_android_unittest.cc",
|
| + ]
|
| deps += [ "//services/device/fingerprint" ]
|
| }
|
|
|
| if (is_android) {
|
| - deps += [ "//services/device/vibration/android:vibration_jni_headers" ]
|
| + sources += [ "sensors/sensor_manager_android_unittest.cc" ]
|
| + deps += [
|
| + "//services/device/sensors:java",
|
| + "//services/device/vibration/android:vibration_jni_headers",
|
| + ]
|
| } else {
|
| deps += [
|
| "//device/battery",
|
| @@ -156,6 +164,7 @@ if (is_android) {
|
| "//mojo/public/java:system_java",
|
| "//services/device/public/interfaces:interfaces_java",
|
| "//services/device/screen_orientation:java",
|
| + "//services/device/sensors:java",
|
| "//services/device/time_zone_monitor:java",
|
| "//services/device/vibration/android:vibration_manager_java",
|
| "//services/service_manager/public/interfaces:interfaces_java",
|
|
|