Update from chromium https://crrev.com/301315

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 402 matching lines @@
   if (defined(invoker.testonly)) { testonly = invoker.testonly }
 
   assert(defined(invoker.resources))
   assert(defined(invoker.res_dir))
 
   _base_path = "$target_gen_dir/$target_name"
   _resources_zip = _base_path + ".resources.zip"
   _build_config = _base_path + ".build_config"
 
   write_build_config("${target_name}__build_config") {
+    build_config = _build_config
+    resources_zip = _resources_zip
     type = "android_resources"
   }
 
   action("${target_name}__template") {
     sources = invoker.resources
     script = "//build/android/gyp/jinja_template.py"
     depfile = "$target_gen_dir/$target_name.d"
 
     outputs = [
       depfile,
@@ skipping 239 matching lines @@
 #       ":foo_generated_enum"
 #     ]
 #     jar_excluded_patterns = [
 #       "*/FooService.class", "*/FooService##*.class"
 #     ]
 #   }
 template("android_library") {
   if (defined(invoker.testonly)) { testonly = invoker.testonly }
 
   assert(defined(invoker.java_files) || defined(invoker.DEPRECATED_java_in_dir)
-      || defined(invoker.srcjars))
+      || defined(invoker.srcjars) || defined(invoker.srcjar_deps))
   _base_path = "$target_gen_dir/$target_name"
   _build_config = _base_path + ".build_config"
   _jar_path = _base_path + ".jar"
   _dex_path = _base_path + ".dex.jar"
 
   write_build_config("${target_name}__build_config") {
     type = "android_library"
 
     deps = []
     if (defined(invoker.deps)) {
@@ skipping 289 matching lines @@
     }
 
     _native_libs = invoker.native_libs
     _native_libs_dir = base_path + "/libs"
 
     if (_use_chromium_linker) {
       _native_libs += [
         "$root_build_dir/lib.stripped/libchromium_android_linker.so"
       ]
     }
+
+    _enable_relocation_packing = false
+    if (_use_chromium_linker && defined(invoker.enable_relocation_packing) &&
+        invoker.enable_relocation_packing) {
+      _enable_relocation_packing = true
+    }
   }
 
   _rebased_build_config = rebase_path(build_config, root_build_dir)
 
   write_build_config("${_template_name}__build_config") {
     type = "android_apk"
     dex_path = final_dex_path
     resources_zip = resources_zip_path
 
     if (defined(invoker.deps)) {
@@ skipping 148 matching lines @@
   }
 
   final_deps += [":${_template_name}__create"]
   create_apk("${_template_name}__create") {
     apk_path = _final_apk_path
     android_manifest = invoker.android_manifest
     resources_zip = all_resources_zip_path
     dex_path = final_dex_path
     load_library_from_apk = _load_library_from_apk
 
+    version_code = "1"
+    if (defined(invoker.version_code)) {
+      version_code = invoker.version_code
+    }
+
+    version_name = "Developer Build"
+    if (defined(invoker.version_name)) {
+      version_name = invoker.version_name
+    }
+
     if (defined(invoker.asset_location)) {
       asset_location = invoker.asset_location
     }
 
     keystore_name = _keystore_name
     keystore_path = _keystore_path
     keystore_password = _keystore_password
 
     if (_native_libs != []) {
       native_libs_dir = _native_libs_dir
@@ skipping 269 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) {
   }
 }