[GN] Add data_deps support to [android_]java_prebuilt

build/config/android/internal_rules.gni

Index: build/config/android/internal_rules.gni
diff --git a/build/config/android/internal_rules.gni b/build/config/android/internal_rules.gni
index 091ee4ac2ebc7051e855c45ecba0a2fb7392d1f3..f3c1c89480367cd098995dede5e40f07650cf89e 100644
--- a/build/config/android/internal_rules.gni
+++ b/build/config/android/internal_rules.gni
@@ -256,6 +256,9 @@ template("write_build_config") {
     if (defined(invoker.deps)) {
       deps += invoker.deps
     }
+    if (defined(invoker.data_deps)) {
+      data_deps = invoker.data_deps
+    }
 
     possible_deps_configs = []
     foreach(d, deps) {
@@ -821,6 +824,9 @@ template("java_prebuilt_impl") {
     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) {