[GN] Add data_deps support to [android_]java_prebuilt

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)
 rebased_android_sdk_root = rebase_path(android_sdk_root, root_build_dir)
@@ skipping 238 matching lines @@
     }
 
     script = "//build/android/gyp/write_build_config.py"
     depfile = "$target_gen_dir/$target_name.d"
     inputs = []
 
     deps = []
     if (defined(invoker.deps)) {
       deps += invoker.deps
     }
+    if (defined(invoker.data_deps)) {
+      data_deps = invoker.data_deps
+    }
 
     possible_deps_configs = []
     foreach(d, deps) {
       dep_gen_dir = get_label_info(d, "target_gen_dir")
       dep_name = get_label_info(d, "name")
       possible_deps_configs += [ "$dep_gen_dir/$dep_name.build_config" ]
     }
     rebase_possible_deps_configs =
         rebase_path(possible_deps_configs, root_build_dir)
 
@@ skipping 545 matching lines @@
   write_build_config(build_config_target_name) {
     type = "java_library"
     supports_android = _supports_android
     requires_android =
         defined(invoker.requires_android) && invoker.requires_android
 
     deps = []
     if (defined(invoker.deps)) {
       deps += invoker.deps
     }
+    if (defined(invoker.data_deps)) {

[cjhopman, 2015/06/23 20:47:05]

The data_deps should probably only be added to the final group() target.

[dgn, 2015/06/24 10:27:36]

Thanks, done.

+      data_deps = invoker.data_deps
+    }
     build_config = _build_config
     jar_path = _jar_path
     if (_supports_android) {
       dex_path = _dex_path
     }
   }
 
   process_java_prebuilt(process_jar_target_name) {
     visibility = [ ":$_template_name" ]
     if (_supports_android) {
@@ skipping 698 matching lines @@
     ]
     args = [
       "--depfile",
       rebase_path(depfile, root_build_dir),
       "--script-output-path",
       rebase_path(generated_script, root_build_dir),
     ]
     args += test_runner_args
   }
 }