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

build/config/android/internal_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("//build/config/android/config.gni")
 
 assert(is_android)
 
 
 rebased_android_sdk = rebase_path(android_sdk, root_build_dir)
@@ skipping 235 matching lines @@
   _native_libs_dir = "//build/android/empty/res"
   if (defined(invoker.native_libs_dir)) {
       _native_libs_dir = invoker.native_libs_dir
   }
 
   _asset_location = "//build/android/empty/res"
   if (defined(invoker.asset_location)) {
     _asset_location = invoker.asset_location
   }
 
-  _version_code = "1"
-  _version_name = "Developer Build"
+  _version_code = invoker.version_code
+  _version_name = invoker.version_name
 
   _base_apk_path = _base_path + ".apk_intermediates"
 
   _resource_packaged_apk_path = _base_apk_path + ".ap_"
   _packaged_apk_path = _base_apk_path + ".unfinished.apk"
 
 
   _configuration_name = "Release"
   if (is_debug) {
     _configuration_name = "Debug"
@@ skipping 282 matching lines @@
 
 
 # This adds Android-specific parts to the java_library template.
 #
 # Runs Android lint against the compiled java files.
 # Dexes the output jar for inclusion in an APK.
 template("android_java_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))
   assert(defined(invoker.build_config))
   assert(defined(invoker.jar_path))
   assert(defined(invoker.dex_path))
 
   _srcjar_deps = []
   if (defined(invoker.srcjar_deps)) {
     _srcjar_deps = invoker.srcjar_deps
   }
 
   _srcjars = []
@@ skipping 193 matching lines @@
 
     if (defined(invoker.clear_dir) && invoker.clear_dir) {
       args += ["--clear"]
     }
 
     if (defined(invoker.args)) {
       args += invoker.args
     }
   }
 }