GYP dependencies for JNI _java targets moved to device targets that r…

…equire 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}
cbchan · May 22, 2015 · f1242e5 · f1242e5
1 parent bdbdfcd
commit f1242e5
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 3 deletions.
diff --git a/content/content.gyp b/content/content.gyp
@@ -429,8 +429,6 @@
           'dependencies': [
             '../base/base.gyp:base',
             '../device/battery/battery.gyp:device_battery_java',
-            '../device/bluetooth/bluetooth.gyp:device_bluetooth_java',
-            '../device/vibration/vibration.gyp:device_vibration_java',
             '../media/media.gyp:media_java',
             '../mojo/mojo_base.gyp:mojo_application_bindings',
             '../mojo/mojo_base.gyp:mojo_system_java',

diff --git 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',

diff --git a/device/bluetooth/bluetooth.gyp b/device/bluetooth/bluetooth.gyp
@@ -127,6 +127,7 @@
         }],
         ['OS == "android"', {
           'dependencies': [
+            'device_bluetooth_java',
             'device_bluetooth_jni_headers',
           ],
           'sources': [

diff --git a/device/device_tests.gyp b/device/device_tests.gyp
@@ -94,7 +94,6 @@
             'hid/hid.gyp:device_hid',
           ],
           'dependencies': [
-            'bluetooth/bluetooth.gyp:device_bluetooth_java',
             '../testing/android/native_test.gyp:native_test_native_code',
           ],
           'sources/': [

diff --git a/device/vibration/vibration.gyp b/device/vibration/vibration.gyp
@@ -44,6 +44,7 @@
       'conditions': [
         ['OS == "android"', {
           'dependencies': [
+            'device_vibration_java',
             'device_vibration_jni_headers',
           ],
           'sources!': [