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

Unified Diff: services/device/BUILD.gn

Issue 2774783003: [DeviceService] Add service tests for VibrationManager. (Closed)
Patch Set: Address comments from blundell@ Created 3 years, 8 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
« no previous file with comments | « services/BUILD.gn ('k') | services/device/device_service_test_base.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/device/BUILD.gn
diff --git a/services/device/BUILD.gn b/services/device/BUILD.gn
index fbcee0cc3d2b59f886a86227db6b492f4f20a96e..28f91af2d9ccb2c3bb6c4c456fefad13b532e814 100644
--- a/services/device/BUILD.gn
+++ b/services/device/BUILD.gn
@@ -3,6 +3,7 @@
# found in the LICENSE file.
import("//build/config/features.gni")
+import("//services/catalog/public/tools/catalog.gni")
import("//services/service_manager/public/cpp/service.gni")
import("//services/service_manager/public/service_manifest.gni")
@@ -13,7 +14,10 @@ if (is_android) {
source_set("lib") {
# This should be visible only to embedders of the Device Service, and the
# dependence should only be for the purpose of embedding the Device Service.
- visibility = [ "//content/browser" ]
+ visibility = [
+ ":test_support",
+ "//content/browser",
+ ]
sources = [
"device_service.cc",
"device_service.h",
@@ -23,6 +27,7 @@ source_set("lib") {
"//base",
"//device/battery:mojo_bindings",
"//device/sensors",
+ "//device/sensors/public/interfaces",
"//device/vibration:mojo_bindings",
"//device/wake_lock",
"//services/device/fingerprint",
@@ -53,11 +58,14 @@ source_set("tests") {
sources = [
"power_monitor/power_monitor_message_broadcaster_unittest.cc",
"public/cpp/power_monitor/power_monitor_broadcast_source_unittest.cc",
+ "vibration/vibration_manager_impl_unittest.cc",
]
deps = [
+ ":test_support",
"//base",
"//base/test:test_support",
+ "//device/vibration:mojo_bindings",
"//mojo/public/cpp/bindings",
"//services/device/power_monitor",
"//services/device/public/cpp/power_monitor",
@@ -70,9 +78,18 @@ source_set("tests") {
}
if (is_android) {
- deps += [ ":device_service_jni_headers" ]
+ deps += [
+ ":device_service_jni_headers",
+ "//device/vibration/android:vibration_jni_headers",
+ ]
+ public_deps = [
+ "//services/device:java",
+ ]
} else {
- deps += [ "//device/battery" ]
+ deps += [
+ "//device/battery",
+ "//device/vibration",
+ ]
}
}
@@ -81,6 +98,36 @@ service_manifest("manifest") {
source = "manifest.json"
}
+service_manifest("unittest_manifest") {
+ name = "device_unittests"
+ source = "unittest_manifest.json"
+ packaged_services = [ ":manifest" ]
+}
+
+catalog("tests_catalog") {
+ testonly = true
+ embedded_services = [ ":unittest_manifest" ]
+}
+
+source_set("test_support") {
+ testonly = true
+
+ sources = [
+ "device_service_test_base.cc",
+ "device_service_test_base.h",
+ ]
+
+ deps = [
+ ":lib",
+ "//base",
+ "//base/test:test_support",
+ "//mojo/public/cpp/bindings",
+ "//services/device/public/interfaces:constants",
+ "//services/service_manager/public/cpp:service_test_support",
+ "//services/service_manager/public/cpp:sources",
+ ]
+}
+
if (is_android) {
generate_jni("device_service_jni_headers") {
sources = [
@@ -95,7 +142,10 @@ if (is_android) {
# //content/public/android:* here actually wants to identify the
# //content/public/android:content_java target and all of its generated
# targets which also need to see this target as well.
- visibility = [ "//content/public/android:*" ]
+ visibility = [
+ ":tests",
+ "//content/public/android:*",
+ ]
java_files = [ "android/java/src/org/chromium/services/device/InterfaceRegistrar.java" ]
deps = [
"//base:base_java",
« no previous file with comments | « services/BUILD.gn ('k') | services/device/device_service_test_base.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698