GYP dependencies for JNI _java targets moved to device targets that require them.

device/battery/battery.gyp

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     'chromium_code': 1,
   },
   'targets': [
     {
@@ skipping 71 matching lines @@
           'dependencies': [
             '../../build/linux/system.gyp:dbus',
             '../../chromeos/chromeos.gyp:chromeos',
             '../../chromeos/chromeos.gyp:power_manager_proto',
           ],
           'sources!': [
             'battery_status_manager_default.cc',
             'battery_status_manager_linux.cc',
           ],
         }],
+        ['OS == "android"', {
+          'dependencies': [
+            'device_battery_java',
+          ],
+        }],
         ['OS == "linux" and use_dbus==1', {
           'sources!': [
             'battery_status_manager_default.cc',
           ],
           'dependencies': [
             '../../build/linux/system.gyp:dbus',
             '../../dbus/dbus.gyp:dbus',
           ],
         }, {  # OS != "linux" or use_dbus==0
           'sources!': [
@@ skipping 39 matching lines @@
             '../../base/base.gyp:base',
             '../../base/base.gyp:base_java_test_support',
             'device_battery_java',
           ],
           'includes': [ '../../build/java.gypi' ],
         },
       ],
     }],
   ],
 }