[DeviceService] Expose battery monitoring solely via the Device Service

services/device/battery/BUILD.gn

Index: services/device/battery/BUILD.gn
diff --git a/device/battery/BUILD.gn b/services/device/battery/BUILD.gn
similarity index 83%
rename from device/battery/BUILD.gn
rename to services/device/battery/BUILD.gn
index 2647882a89477eed07a74d0124b9c5fca5437eca..4f8a2a980f3944589304ac8c6595aba7689f84b0 100644
--- a/device/battery/BUILD.gn
+++ b/services/device/battery/BUILD.gn
@@ -5,13 +5,15 @@
 import("//build/config/features.gni")
 import("//mojo/public/tools/bindings/mojom.gni")
 
-# On android, BatteryManager mojo service is implemented directly in Java.
+# On android, BatteryManager mojo interface is implemented directly in Java.
 if (!is_android) {
-  component("battery") {
-    output_name = "device_battery"
+  source_set("battery") {
+    visibility = [
+      "//services/device:lib",
+      "//services/device:tests",
+    ]
 
     sources = [
-      "battery_export.h",
       "battery_monitor_impl.cc",
       "battery_monitor_impl.h",
       "battery_status_manager.h",
@@ -27,10 +29,11 @@ if (!is_android) {
       "battery_status_service.h",
     ]
 
-    defines = [ "DEVICE_BATTERY_IMPLEMENTATION" ]

[timvolodine, 2017/05/02 18:19:04]

I assume this has no impact anymore? i.e. DEVICE_BATTERY_IMPLEMENTATION removed
at some stage?

[leonhsl(Using Gerrit), 2017/05/03 03:07:02]

Yeah this macro was for identifying DEVICE_BATTERY_EXPORT's value as 'export' or
'import' in case of component build, but now we're moving all battery codes to
be hidden inside Device Service and want to change the battery target from
'component' to 'source_set', so we remove both DEVICE_BATTERY_IMPLEMENTATION and
DEVICE_BATTERY_EXPORT.

+    public_deps = [
+      "//services/device/public/interfaces",
+    ]
 
     deps = [
-      ":mojo_bindings",
       "//base",
       "//base/third_party/dynamic_annotations",
       "//mojo/public/cpp/bindings",
@@ -71,10 +74,3 @@ if (!is_android) {
     }
   }
 }
-
-mojom("mojo_bindings") {
-  sources = [
-    "battery_monitor.mojom",
-    "battery_status.mojom",
-  ]
-}