Android: Add java files from android_apk targets

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.
 
 # Do not add any imports to non-//build directories here.
 # Some projects (e.g. V8) do not have non-build directories DEPS'ed in.
 import("//build/config/android/config.gni")
 import("//build/config/android/internal_rules.gni")
 import("//build/config/compiler/compiler.gni")
 import("//build/config/dcheck_always_on.gni")
@@ skipping 1415 matching lines @@
     assert(defined(invoker.android_manifest))
     gen_dir = "$target_gen_dir/$target_name"
     base_path = "$gen_dir/$target_name"
     _build_config = "$target_gen_dir/$target_name.build_config"
     resources_zip_path = "$base_path.resources.zip"
     _all_resources_zip_path = "$base_path.resources.all.zip"
     _jar_path = "$base_path.jar"
     _lib_dex_path = "$base_path.dex.jar"
     _rebased_lib_dex_path = rebase_path(_lib_dex_path, root_build_dir)
     _template_name = target_name
+    if (defined(invoker.java_files)) {
+      _java_sources_file = "$base_path.sources"
+    }
 
     enable_multidex =
         defined(invoker.enable_multidex) && invoker.enable_multidex
     if (enable_multidex) {
       final_dex_path = "$gen_dir/classes.dex.zip"
     } else {
       final_dex_path = "$gen_dir/classes.dex"
     }
     final_dex_target_name = "${_template_name}__final_dex"
 
@@ skipping 163 matching lines @@
       type = "android_apk"
       jar_path = _jar_path
       dex_path = final_dex_path
       apk_path = _final_apk_path
       incremental_apk_path = "${_final_apk_path_no_ext}_incremental.apk"
       incremental_install_script_path = _incremental_install_script_path
       resources_zip = resources_zip_path
       build_config = _build_config
       android_manifest = _android_manifest
 
+      if (defined(_java_sources_file)) {
+        java_sources_file = _java_sources_file
+      }
+
       deps = _android_manifest_deps
 
       if (defined(invoker.deps)) {
         possible_config_deps = invoker.deps
       }
 
       # Added emma to the target's classpath via its .build_config.
       if (emma_coverage && !_emma_never_instrument) {
         possible_config_deps +=
             [ "//third_party/android_tools:emma_device_java" ]
@@ skipping 146 matching lines @@
       supports_android = true
       requires_android = true
       override_build_config = _build_config
       deps = _android_manifest_deps + [ ":$build_config_target" ]
 
       android_manifest = _android_manifest
       srcjar_deps = _srcjar_deps
       jar_path = _jar_path
       dex_path = _lib_dex_path
       emma_never_instrument = _emma_never_instrument
+      if (defined(_java_sources_file)) {
+        java_sources_file = _java_sources_file
+      }
 
       if (defined(invoker.deps)) {
         deps += invoker.deps
       }
       if (defined(invoker.apk_under_test)) {
         deps += [ "${invoker.apk_under_test}__java" ]
       }
       if (emma_coverage && !_emma_never_instrument) {
         deps += [ "//third_party/android_tools:emma_device_java" ]
       }
@@ skipping 977 matching lines @@
         # because in practice they seem to contain classes required to be in the
         # classpath.
         deps += _subjar_targets
       }
       if (defined(_res_target_name)) {
         deps += [ ":$_res_target_name" ]
       }
     }
   }
 }