Index: device/vibration/vibration.gyp |
diff --git a/device/vibration/vibration.gyp b/device/vibration/vibration.gyp |
index be4068c5ba3dcdaf8a9341a2eb1727704200d8f1..699e9ebeb4ae6ee5885d5ad47329fa68abcb0878 100644 |
--- a/device/vibration/vibration.gyp |
+++ b/device/vibration/vibration.gyp |
@@ -8,7 +8,7 @@ |
}, |
'targets': [ |
{ |
- # GN version: //device/vibration:vibration_mojo |
+ # GN version: //device/vibration:mojo_bindings |
'target_name': 'device_vibration_mojo_bindings', |
'type': 'static_library', |
'includes': [ |
@@ -34,21 +34,13 @@ |
'DEVICE_VIBRATION_IMPLEMENTATION', |
], |
'sources': [ |
- 'android/vibration_jni_registrar.cc', |
- 'android/vibration_jni_registrar.h', |
'vibration_manager_impl.h', |
- 'vibration_manager_impl_android.cc', |
- 'vibration_manager_impl_android.h', |
'vibration_manager_impl_default.cc', |
], |
'conditions': [ |
['OS == "android"', { |
'dependencies': [ |
'device_vibration_java', |
- 'device_vibration_jni_headers', |
- ], |
- 'sources!': [ |
- 'vibration_manager_impl_default.cc', |
timvolodine
2015/08/07 13:42:31
same here: exclude on android?
leonhsl(Using Gerrit)
2015/08/10 05:52:54
Done.
|
], |
}], |
], |
@@ -58,21 +50,12 @@ |
['OS == "android"', { |
'targets': [ |
{ |
- 'target_name': 'device_vibration_jni_headers', |
- 'type': 'none', |
- 'sources': [ |
- 'android/java/src/org/chromium/device/vibration/VibrationProvider.java', |
- ], |
- 'variables': { |
- 'jni_gen_package': 'device_vibration', |
- }, |
- 'includes': [ '../../build/jni_generator.gypi' ], |
- }, |
- { |
'target_name': 'device_vibration_java', |
'type': 'none', |
'dependencies': [ |
'../../base/base.gyp:base', |
+ '../../third_party/mojo/mojo_public.gyp:mojo_bindings_java', |
+ 'device_vibration_mojo_bindings', |
], |
'variables': { |
'java_in_dir': '../../device/vibration/android/java', |