Update from https://crrev.com/316786

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 327 matching lines @@
 template("java_cpp_enum") {
   set_sources_assignment_filter([])
   if (defined(invoker.testonly)) {
     testonly = invoker.testonly
   }
 
   assert(defined(invoker.sources))
   assert(defined(invoker.outputs))
 
   action("${target_name}__generate_enum") {
+    # The sources aren't compiled so don't check their dependencies.
+    # TODO(brettw) uncomment after GN binary rolled pas 314974 (which added
+    # support for this value on actions).
+    #check_includes = false
+
     sources = invoker.sources
     script = "//build/android/gyp/java_cpp_enum.py"
     gen_dir = "${target_gen_dir}/${target_name}/enums"
     outputs =
         get_path_info(rebase_path(invoker.outputs, ".", gen_dir), "abspath")
 
     args = [
       "--output_dir",
       rebase_path(gen_dir, root_build_dir),
     ]
@@ skipping 633 matching lines @@
     }
     if (defined(invoker.testonly)) {
       testonly = invoker.testonly
     }
     if (defined(invoker.visibility)) {
       visibility = invoker.visibility
     }
     if (defined(invoker.dex_path)) {
       dex_path = invoker.dex_path
     }
+    if (defined(invoker.manifest_entries)) {
+      manifest_entries = invoker.manifest_entries
+    }
 
     supports_android = true
     requires_android = true
 
     if (!defined(jar_excluded_patterns)) {
       jar_excluded_patterns = []
     }
     jar_excluded_patterns += [
       "*/R.class",
       "*/R##*.class",
@@ skipping 716 matching lines @@
 template("uiautomator_test") {
   set_sources_assignment_filter([])
   if (defined(invoker.testonly)) {
     testonly = invoker.testonly
   }
   assert(target_name != "")
   assert(invoker.deps != [] || true)
   group(target_name) {
   }
 }