Merge device/vibration/android/BUILD.gn to vibration/BUILD.gn.

Removes need for allowing circular includes.

Review URL: https://codereview.chromium.org/1123283007

Cr-Commit-Position: refs/heads/master@{#329865}

device/vibration/BUILD.gn

@@ -5,15 +5,17 @@
 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_android.cc",
-    "vibration_manager_impl_android.h",
-    "vibration_manager_impl_default.cc",
   ]
 
   defines = [ "DEVICE_VIBRATION_IMPLEMENTATION" ]
@@ -28,12 +30,15 @@ component("vibration") {
   ]
 
   if (is_android) {
-    sources -= [ "vibration_manager_impl_default.cc" ]
-    deps += [
-      "//device/vibration/android",
-      "//device/vibration/android:vibration_jni_headers",
+    sources += [
+      "android/vibration_jni_registrar.cc",
+      "android/vibration_jni_registrar.h",
+      "vibration_manager_impl_android.cc",
+      "vibration_manager_impl_android.h",
     ]
-    allow_circular_includes_from = [ "//device/vibration/android" ]
+    deps += [ ":vibration_jni_headers" ]
+  } else {
+    sources += [ "vibration_manager_impl_default.cc" ]
   }
 }
 
@@ -42,3 +47,12 @@ 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"
+  }
+}

device/vibration/android/BUILD.gn

-# 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.
-
-import("//build/config/android/config.gni")
-import("//build/config/android/rules.gni")
-
-assert(is_android)
-
-source_set("android") {
-  sources = [
-    "vibration_jni_registrar.cc",
-    "vibration_jni_registrar.h",
-  ]
-
-  defines = [ "DEVICE_VIBRATION_IMPLEMENTATION" ]
-
-  deps = [
-    "//base",
-
-    # vibration_jni_registrar.cc includes a header from device/vibration
-    # that includes a mojo-generated header file.  Make sure the header
-    # is generated before vibration_jni_registrar.cc is compiled.
-    "//device/vibration:mojo_bindings",
-  ]
-}
-
-generate_jni("vibration_jni_headers") {
-  sources = [
-    "java/src/org/chromium/device/vibration/VibrationProvider.java",
-  ]
-  jni_package = "vibration"
-}