Include generated EffectiveConnectionType.java in cronet api jar and JavaDoc

components/cronet/android/BUILD.gn

 # Copyright 2015 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/buildflag_header.gni")
 import("//build/config/android/config.gni")
 import("//build/config/android/rules.gni")
 import("//build/util/version.gni")
 import("//chrome/version.gni")
 import("//testing/test.gni")
@@ skipping 798 matching lines @@
       depfile,
       invoker.jar_path,
     ]
     args = [
       "--src-dir=${_rebased_src_dirs}",
       "--jar-path",
       rebase_path(invoker.jar_path, root_build_dir),
       "--depfile",
       rebase_path(depfile, root_build_dir),
     ]
+
+    if (defined(invoker.src_jars)) {
+      _rebased_src_jars = rebase_path(invoker.src_jars, root_build_dir)
+      args += [ "--src-jar=${_rebased_src_jars}" ]
+    }
+    deps = [
+      ":effective_connection_type_java",
+    ]
   }
 }
 
 jar_src("jar_cronet_api_source") {
   src_dirs = [ "api/src" ]
+
+  # Include generated Java files which should be a part of the API.
+  src_jars = [ "$root_gen_dir/components/cronet/android/effective_connection_type_java.srcjar" ]
   jar_path = "$_package_dir/cronet_api-src.jar"
 }
 
 jar_src("jar_cronet_sample_source") {
   src_dirs = [ "sample" ]
   jar_path = "$_package_dir/cronet-sample-src.jar"
 }
 
 jar_src("jar_cronet_other_source") {
   src_dirs = [
@@ skipping 31 matching lines @@
     rebase_path("//components/cronet", root_build_dir),
     "--overview-file",
     rebase_path("$_package_dir/README.md.html", root_build_dir),
     "--readme-file",
     rebase_path("//components/cronet/README.md", root_build_dir),
     "--depfile",
     rebase_path(depfile, root_build_dir),
     "--lib-java-dir",
     rebase_path("$root_build_dir/lib.java/components/cronet/android",
                 root_build_dir),
+
+    # JavaDoc is generated from Cronet's API source jar.
+    "--input-src-jar",
+    rebase_path("$_package_dir/cronet_api-src.jar", root_build_dir),
   ]
   deps = [
     ":cronet_javadoc_classpath",
+    ":jar_cronet_api_source",
   ]
 }
 
 copy("cronet_package_copy") {
   sources = [
     "$root_out_dir/lib.java/components/cronet/android/cronet_api.jar",
     "//AUTHORS",
     "//chrome/VERSION",
     "//components/cronet/android/proguard.cfg",
   ]
@@ skipping 36 matching lines @@
     ":cronet_package_copy_native_lib",
     ":cronet_package_copy_native_lib_unstripped",
     ":generate_javadoc",
     ":generate_licenses",
     ":jar_cronet_api_source",
     ":jar_cronet_other_source",
     ":jar_cronet_sample_source",
     ":repackage_extracted_jars",
   ]
 }