Update from https://crrev.com/305340

build/config/android/rules.gni

 # 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("//base/android/linker/config.gni")
 import("//build/config/android/config.gni")
 import("//build/config/android/internal_rules.gni")
 import("//tools/grit/grit_rule.gni")
 import("//tools/relocation_packer/config.gni")
 
@@ skipping 637 matching lines @@
 # Variables
 #   deps: Specifies the dependencies of this target. Java targets in this list
 #     will be included in the executable (and the javac classpath).
 #
 #   java_files: List of .java files included in this library.
 #   srcjar_deps: List of srcjar dependencies. The .java files in the srcjars
 #     will be added to java_files and be included in this library.
 #   srcjars: List of srcjars to be included in this library, together with the
 #     ones obtained from srcjar_deps.
 #
+#   bypass_platform_checks: Disables checks about cross-platform (Java/Android)
+#     dependencies for this target. This will allow depending on an
+#     android_library target, for example.
+#
 #   chromium_code: If true, extra analysis warning/errors will be enabled.
 #
 #   datadeps, testonly
 #
 # Example
 #   java_library("foo") {
 #     java_files = [ "org/chromium/foo/FooMain.java" ]
 #     deps = [ ":bar_java" ]
 #     main_class = "org.chromium.foo.FooMain"
 #   }
 template("java_binary") {
   # TODO(cjhopman): This should not act like a java_library for dependents (i.e.
   # dependents shouldn't get the jar in their classpath, etc.).
   java_library_impl(target_name) {
     if (defined(invoker.DEPRECATED_java_in_dir)) { DEPRECATED_java_in_dir = invoker.DEPRECATED_java_in_dir }
     if (defined(invoker.chromium_code)) { chromium_code = invoker.chromium_code }
     if (defined(invoker.datadeps)) { deps = invoker.datadeps }
     if (defined(invoker.deps)) { deps = invoker.deps }
     if (defined(invoker.java_files)) { java_files = invoker.java_files }
     if (defined(invoker.srcjar_deps)) { srcjar_deps = invoker.srcjar_deps }
     if (defined(invoker.srcjars)) { srcjars = invoker.srcjars }
+    if (defined(invoker.bypass_platform_checks)) { bypass_platform_checks = invoker.bypass_platform_checks }
     if (defined(invoker.testonly)) { testonly = invoker.testonly }
 
     main_class = invoker.main_class
   }
 }
 
 
 # Declare an java library target
 #
 # Variables
@@ skipping 13 matching lines @@
 #   jar_excluded_patterns: List of patterns of .class files to exclude from the
 #     final jar.
 #
 #   proguard_preprocess: If true, proguard preprocessing will be run. This can
 #     be used to remove unwanted parts of the library.
 #   proguard_config: Path to the proguard config for preprocessing.
 #
 #   supports_android: If true, Android targets (android_library, android_apk)
 #     may depend on this target. Note: if true, this target must only use the
 #     subset of Java available on Android.
-#   requires_android_platform: If true, this library may depend on
-#     android-specific targets. If this is the case, there should be some
-#     android-platform-like implementation available at runtime (Android,
-#     robolectric, etc).
+#   bypass_platform_checks: Disables checks about cross-platform (Java/Android)
+#     dependencies for this target. This will allow depending on an
+#     android_library target, for example.
 #
 #   datadeps, testonly
 #
 # Example
 #   java_library("foo_java") {
 #     java_files = [
 #       "org/chromium/foo/Foo.java",
 #       "org/chromium/foo/FooInterface.java",
 #       "org/chromium/foo/FooService.java",
 #     ]
@@ skipping 12 matching lines @@
     if (defined(invoker.DEPRECATED_java_in_dir)) { DEPRECATED_java_in_dir = invoker.DEPRECATED_java_in_dir }
     if (defined(invoker.chromium_code)) { chromium_code = invoker.chromium_code }
     if (defined(invoker.datadeps)) { deps = invoker.datadeps }
     if (defined(invoker.deps)) { deps = invoker.deps }
     if (defined(invoker.jar_excluded_patterns)) { jar_excluded_patterns = invoker.jar_excluded_patterns }
     if (defined(invoker.java_files)) { java_files = invoker.java_files }
     if (defined(invoker.proguard_config)) { proguard_config = invoker.proguard_config }
     if (defined(invoker.proguard_preprocess)) { proguard_preprocess = invoker.proguard_preprocess }
     if (defined(invoker.srcjar_deps)) { srcjar_deps = invoker.srcjar_deps }
     if (defined(invoker.srcjars)) { srcjars = invoker.srcjars }
+    if (defined(invoker.bypass_platform_checks)) { bypass_platform_checks = invoker.bypass_platform_checks }
     if (defined(invoker.testonly)) { testonly = invoker.testonly }
     if (defined(invoker.jar_path)) { jar_path = invoker.jar_path }
 
     if (defined(invoker.supports_android) && invoker.supports_android) {
       supports_android = true
     }
-    if (defined(invoker.requires_android_platform)
-        && invoker.requires_android_platform) {
-      supports_android = true
-      requires_android = true
-    }
   }
 }
 
 
 # Declare an java library target for a prebuilt jar
 #
 # Variables
 #   deps: Specifies the dependencies of this target. Java targets in this list
 #     will be added to the javac classpath.
 #   jar_path: Path to the prebuilt jar.
@@ skipping 724 matching lines @@
 }
 
 # TODO(GYP): implement this.
 template("uiautomator_test") {
   if (defined(invoker.testonly)) { testonly = invoker.testonly }
   assert(target_name != "")
   assert(invoker.deps != [] || true)
   group(target_name) {
   }
 }