Port BatteryMonitor into Device Service

services/device/BUILD.gn

Index: services/device/BUILD.gn
diff --git a/services/device/BUILD.gn b/services/device/BUILD.gn
index d6c468dc3dae1778012e5c7c6e8b8ec61d1e023a..2b814aabc598efae7e16a2e1321e1d15a453503a 100644
--- a/services/device/BUILD.gn
+++ b/services/device/BUILD.gn
@@ -2,9 +2,14 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import("//build/config/features.gni")
 import("//services/service_manager/public/cpp/service.gni")
 import("//services/service_manager/public/service_manifest.gni")
 
+if (is_android) {
+  import("//build/config/android/rules.gni")  # For generate_jni().
+}
+
 source_set("lib") {
   sources = [
     "device_service.cc",
@@ -13,6 +18,8 @@ source_set("lib") {
 
   deps = [
     "//base",
+    "//device/battery",
+    "//device/battery:mojo_bindings",
     "//device/power_monitor",
     "//device/time_zone_monitor",
     "//services/service_manager/public/cpp",
@@ -28,9 +35,38 @@ source_set("lib") {
   data_deps = [
     ":manifest",
   ]
+
+  if (is_android) {
+    deps -= [ "//device/battery" ]

[Sam McNally, 2017/01/25 05:53:06]

if (is_android) {
  deps += [ ":device_service_jni_headers" ]
} else {
  deps += [ "//device/battery" ]
}

[blundell, 2017/01/25 15:00:34]

Done.

+
+    deps += [ ":device_service_jni_headers" ]
+  }
 }
 
 service_manifest("manifest") {
   name = "device"
   source = "manifest.json"
 }
+
+if (is_android) {
+  generate_jni("device_service_jni_headers") {
+    sources = [
+      "android/java/src/org/chromium/services/device/InterfaceRegistrar.java",
+    ]
+    jni_package = "device_service"
+  }
+
+  android_library("java") {
+    java_files = [ "android/java/src/org/chromium/services/device/InterfaceRegistrar.java" ]
+    deps = [
+      "//base:base_java",
+      "//device/battery:mojo_bindings_java",
+      "//device/battery/android:battery_monitor_java",
+      "//mojo/android:system_java",
+      "//mojo/public/java:bindings_java",
+      "//mojo/public/java:system_java",
+      "//services/service_manager/public/interfaces:interfaces_java",
+      "//services/service_manager/public/java:service_manager_java",
+    ]
+  }
+}