Index: device/vibration/BUILD.gn |
diff --git a/device/vibration/BUILD.gn b/device/vibration/BUILD.gn |
index b315e572a52cceba0eb4d870b4d2990143bf5e20..2640e906d8d36995cb686622e6858eaf4fab70d5 100644 |
--- a/device/vibration/BUILD.gn |
+++ b/device/vibration/BUILD.gn |
@@ -5,17 +5,13 @@ |
import("//build/config/features.gni") |
import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni") |
-if (is_android) { |
- import("//build/config/android/config.gni") |
- import("//build/config/android/rules.gni") # For generate_jni(). |
-} |
- |
component("vibration") { |
output_name = "device_vibration" |
sources = [ |
"vibration_export.h", |
"vibration_manager_impl.h", |
+ "vibration_manager_impl_default.cc", |
timvolodine
2015/08/07 13:42:31
we probably still want to exclude this for android
leonhsl(Using Gerrit)
2015/08/10 05:52:53
Done.
|
] |
defines = [ "DEVICE_VIBRATION_IMPLEMENTATION" ] |
@@ -28,18 +24,6 @@ component("vibration") { |
"//third_party/mojo/src/mojo/public/cpp/bindings", |
"//third_party/mojo/src/mojo/edk/system", |
] |
- |
- if (is_android) { |
- sources += [ |
- "android/vibration_jni_registrar.cc", |
- "android/vibration_jni_registrar.h", |
- "vibration_manager_impl_android.cc", |
- "vibration_manager_impl_android.h", |
- ] |
- deps += [ ":vibration_jni_headers" ] |
- } else { |
- sources += [ "vibration_manager_impl_default.cc" ] |
- } |
} |
mojom("mojo_bindings") { |
@@ -47,12 +31,3 @@ mojom("mojo_bindings") { |
"vibration_manager.mojom", |
] |
} |
- |
-if (is_android) { |
- generate_jni("vibration_jni_headers") { |
- sources = [ |
- "android/java/src/org/chromium/device/vibration/VibrationProvider.java", |
- ] |
- jni_package = "vibration" |
- } |
-} |