Add content_shell_test_apk and a several dependencies

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 160 matching lines @@
   assert(defined(invoker.output))
   action(target_name) {
     script = "//build/android/gyp/dex.py"
     depfile = "$target_gen_dir/$target_name.d"
     sources = invoker.sources
     outputs = [depfile, invoker.output]
     if (defined(invoker.inputs)) {
       inputs = invoker.inputs
     }
 
+    if (defined(invoker.deps)) {
+      deps = invoker.deps
+    }
+
     rebased_output = rebase_path(invoker.output, root_build_dir)
 
     args = [
       "--depfile", rebase_path(depfile, root_build_dir),
       "--android-sdk-tools", rebased_android_sdk_build_tools,
       "--dex-path", rebased_output,
     ]
 
     if (defined(invoker.no_locals) && invoker.no_locals) {
       args += [
@@ skipping 318 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") {
   assert(defined(invoker.java_files) || defined(invoker.DEPRECATED_java_in_dir))
   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
+  }
+
   _java_files = []
   if (defined(invoker.java_files)) {
     _java_files = invoker.java_files
   } else {
     _java_files_build_rel = exec_script(
         "//build/android/gyp/find.py",
         [
           "--pattern",
           "*.java",
           rebase_path(invoker.DEPRECATED_java_in_dir, root_build_dir)
         ],
         "list lines"
         )
     _java_files = rebase_path(_java_files_build_rel, ".", root_build_dir)
   }
+  assert(_java_files != [] || _srcjar_deps != [])
 
   _jar_path = invoker.jar_path
   _dex_path = invoker.dex_path
 
   _android_manifest = "//build/android/AndroidManifest.xml"
   if (defined(invoker.android_manifest)) {
     _android_manifest = invoker.android_manifest
   }
   assert(_android_manifest != "")
 
   _final_deps = []
+  _final_datadeps = []
 
   java_library("${target_name}__java_library") {
     jar_path = _jar_path
     if (defined(invoker.jar_excluded_patterns)) {
       jar_excluded_patterns = invoker.jar_excluded_patterns
     }
     build_config = invoker.build_config
     java_files = _java_files
+    srcjar_deps = _srcjar_deps
 
-    if (defined(invoker.srcjar_deps)) {
-      srcjar_deps = invoker.srcjar_deps
-    }
     if (defined(invoker.proguard_preprocess) && invoker.proguard_preprocess) {
       proguard_preprocess = invoker.proguard_preprocess
       proguard_config = invoker.proguard_config
     }
+
+    if (defined(invoker.dist_jar_path)) {
+      dist_jar_path = invoker.dist_jar_path
+    }
   }
 
   if (defined(invoker.chromium_code) && invoker.chromium_code) {
-    _final_deps += [ ":${target_name}__lint" ]
+    _final_datadeps += [ ":${target_name}__lint" ]
     android_lint("${target_name}__lint") {
       android_manifest = _android_manifest
       jar_path = _jar_path
       java_files = _java_files
     }
   }
 
   dex("${target_name}__dex") {
     sources = [_jar_path]
     output = _dex_path
   }
 
   group(target_name) {
     deps = [
       ":${target_name}__java_library",
       ":${target_name}__dex",
-    ] + _final_deps
+    ] + _final_deps + _final_datadeps
   }
 }
 
 # Runs process_resources.py
 template("process_resources") {
   zip_path = invoker.zip_path
   srcjar_path = invoker.srcjar_path
   build_config = invoker.build_config
   resource_dirs = invoker.resource_dirs
   android_manifest = invoker.android_manifest
@@ skipping 86 matching lines @@
       "--dest", rebase_path(invoker.dest, root_build_dir),
     ]
     if (defined(invoker.args)) {
       args += invoker.args
     }
     if (defined(invoker.clear_dir) && invoker.clear_dir) {
       args += ["--clear"]
     }
   }
 }