summaryrefslogtreecommitdiffstats
path: root/device/battery
diff options
context:
space:
mode:
authorscheib <scheib@chromium.org>2015-05-21 22:31:06 -0700
committerCommit bot <commit-bot@chromium.org>2015-05-22 05:31:44 +0000
commitf1242e526088837d9cac99bce9fbf1e9de47423f (patch)
tree87228c72e171a9f5fc24ee63d9e28221dbc2b08e /device/battery
parentbdbdfcd505a3a1b6c85229a426af795124ff0f54 (diff)
downloadchromium_src-f1242e526088837d9cac99bce9fbf1e9de47423f.zip
chromium_src-f1242e526088837d9cac99bce9fbf1e9de47423f.tar.gz
chromium_src-f1242e526088837d9cac99bce9fbf1e9de47423f.tar.bz2
GYP dependencies for JNI _java targets moved to device targets that require them.
Previously _java targets for android JNI were indirectly included in build dependencies by higher level targets. This change moves the dependencies directly to the targets that require them. Review URL: https://codereview.chromium.org/1127043006 Cr-Commit-Position: refs/heads/master@{#331068}
Diffstat (limited to 'device/battery')
-rw-r--r--device/battery/battery.gyp5
1 files changed, 5 insertions, 0 deletions
diff --git a/device/battery/battery.gyp b/device/battery/battery.gyp
index b5c55b0..d55c7f9 100644
--- a/device/battery/battery.gyp
+++ b/device/battery/battery.gyp
@@ -89,6 +89,11 @@
'battery_status_manager_linux.cc',
],
}],
+ ['OS == "android"', {
+ 'dependencies': [
+ 'device_battery_java',
+ ],
+ }],
['OS == "linux" and use_dbus==1', {
'sources!': [
'battery_status_manager_default.cc',