Add src_files to src_jar GN template

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 262 matching lines @@
 
   # Avoid hide_native_jni_exports as it adds another version script, and the
   # ARM64 linker throws an error for multiple version scripts with anonymous
   # version tags.
   configs -= [ "//build/config/android:hide_native_jni_exports" ]
 }
 
 # cronet_api.jar defines Cronet API and provides implementation of
 # legacy api using HttpUrlConnection (not the Chromium stack).
 android_library("cronet_api") {
   java_files = [

[xunjieli, 2016/09/16 18:39:49]

How about move put this list as a variable? so we can reuse it as well in
jar_cronet_api_source. This will help us to not make the two jars diverge.

[kapishnikov, 2016/09/16 20:28:27]

Implemented Paul's suggestion to build cronet_api library from the source jar.

     "api/src/org/chromium/net/BidirectionalStream.java",
     "api/src/org/chromium/net/ChunkedWritableByteChannel.java",
     "api/src/org/chromium/net/CronetEngine.java",
     "api/src/org/chromium/net/CronetException.java",
     "api/src/org/chromium/net/HttpUrlConnectionUrlRequest.java",
     "api/src/org/chromium/net/HttpUrlConnectionUrlRequestFactory.java",
     "api/src/org/chromium/net/HttpUrlRequest.java",
     "api/src/org/chromium/net/HttpUrlRequestFactory.java",
     "api/src/org/chromium/net/HttpUrlRequestListener.java",
     "api/src/org/chromium/net/InlineExecutionProhibitedException.java",
     "api/src/org/chromium/net/InputStreamChannel.java",
     "api/src/org/chromium/net/JavaCronetEngine.java",
     "api/src/org/chromium/net/JavaUrlRequest.java",
     "api/src/org/chromium/net/NetworkQualityRttListener.java",
     "api/src/org/chromium/net/NetworkQualityThroughputListener.java",
     "api/src/org/chromium/net/Preconditions.java",
     "api/src/org/chromium/net/QuicException.java",
     "api/src/org/chromium/net/RequestFinishedInfo.java",
     "api/src/org/chromium/net/ResponseTooLargeException.java",
     "api/src/org/chromium/net/UploadDataProvider.java",
     "api/src/org/chromium/net/UploadDataProviders.java",
     "api/src/org/chromium/net/UploadDataSink.java",
     "api/src/org/chromium/net/UrlRequest.java",
     "api/src/org/chromium/net/UrlRequestException.java",
     "api/src/org/chromium/net/UrlResponseInfo.java",
     "api/src/org/chromium/net/UserAgent.java",

[pauljensen, 2016/09/16 18:38:39]

can we get rid of these lists and simply add the right srcjar to the srcjar_deps
list below?  I don't really like the idea of duplicating the massive file lists;
seems like a recipe for divergence.

[kapishnikov, 2016/09/16 20:28:27]

Done.

   ]
 
   deps = [
     "//third_party/android_tools:android_support_annotations_java",
   ]
 
   srcjar_deps = [
     ":cronet_api_version_srcjar",
     ":effective_connection_type_java",
     ":http_cache_type_java",
@@ skipping 484 matching lines @@
     rebase_path(_output_jar, root_build_dir),
   ]
 
   deps = [
     ":extract_cronet_jars",
   ]
 }
 
 template("jar_src") {
   action(target_name) {
-    _rebased_src_dirs = rebase_path(invoker.src_dirs, root_build_dir)
+    _rebased_src_search_dirs =
+        rebase_path(invoker.src_search_dirs, root_build_dir)
 
     script = "//components/cronet/tools/jar_src.py"
     depfile = "$target_gen_dir/$target_name.d"
     outputs = [
       invoker.jar_path,
     ]
     args = [
-      "--src-dir=${_rebased_src_dirs}",
+      "--src-search-dirs=${_rebased_src_search_dirs}",
+      "--src-files=${invoker.src_files}",
       "--jar-path",
       rebase_path(invoker.jar_path, root_build_dir),
       "--depfile",
       rebase_path(depfile, root_build_dir),
     ]
 
     if (defined(invoker.src_jars)) {
       inputs = 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" ]
+  src_search_dirs = [ "api/src" ]
+  src_files = [
+    "org/chromium/net/BidirectionalStream.java",
+    "org/chromium/net/ChunkedWritableByteChannel.java",
+    "org/chromium/net/CronetEngine.java",
+    "org/chromium/net/CronetException.java",
+    "org/chromium/net/HttpUrlConnectionUrlRequestFactory.java",
+    "org/chromium/net/HttpUrlConnectionUrlRequest.java",
+    "org/chromium/net/HttpUrlRequestFactory.java",
+    "org/chromium/net/HttpUrlRequest.java",
+    "org/chromium/net/HttpUrlRequestListener.java",
+    "org/chromium/net/InlineExecutionProhibitedException.java",
+    "org/chromium/net/InputStreamChannel.java",
+    "org/chromium/net/JavaCronetEngine.java",
+    "org/chromium/net/JavaUrlRequest.java",
+    "org/chromium/net/NetworkQualityRttListener.java",
+    "org/chromium/net/NetworkQualityThroughputListener.java",
+    "org/chromium/net/Preconditions.java",
+    "org/chromium/net/QuicException.java",
+    "org/chromium/net/RequestFinishedInfo.java",
+    "org/chromium/net/ResponseTooLargeException.java",
+    "org/chromium/net/UploadDataProvider.java",
+    "org/chromium/net/UploadDataProviders.java",
+    "org/chromium/net/UploadDataSink.java",
+    "org/chromium/net/UrlRequestException.java",
+    "org/chromium/net/UrlRequest.java",
+    "org/chromium/net/UrlResponseInfo.java",
+    "org/chromium/net/UserAgent.java",
+  ]
 
   # 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" ]
+  src_search_dirs = [ "sample" ]
+  src_files = [
+    "AndroidManifest.xml",
+    "javatests/AndroidManifest.xml",
+    "javatests/proguard.cfg",
+    "javatests/src/org/chromium/cronet_sample_apk/Criteria.java",
+    "javatests/src/org/chromium/cronet_sample_apk/CronetSampleTest.java",
+    "README",
+    "res/layout/activity_main.xml",
+    "res/layout/dialog_url.xml",
+    "res/values/dimens.xml",
+    "res/values/strings.xml",
+    "src/org/chromium/cronet_sample_apk/CronetSampleActivity.java",
+    "src/org/chromium/cronet_sample_apk/CronetSampleApplication.java",
+  ]
   jar_path = "$_package_dir/cronet-sample-src.jar"
 }
 
 jar_src("jar_cronet_other_source") {
-  src_dirs = [
+  src_search_dirs = [
     "//base/android/java/src",
     "//components/cronet/android/java/src",
     "//net/android/java/src",
     "//url/android/java/src",
   ]
+  src_files = [

[xunjieli, 2016/09/16 18:39:49]

I am a bit concerned about listing non-cronet java files explicitly. How do we
ensure that this stay in sync? Normal Android bots only compile cronet
instrumentation target, not :cronet_package. 

[kapishnikov, 2016/09/16 20:28:27]

Good point. If we want to keep cronet-src.jar file, I think we should build
individual srcjars in their corresponding packages, i.e. base, net & url. The
cronet BUILD.gn should dependent on them.

[xunjieli, 2016/09/16 20:42:24]

If we can get rid of cronet-src.jar, then it will be great. I think developers
are only interested in cronet_api-src.jar. Might be worth checking in with Misha
whether we can get rid of this.
 

+    "org/chromium/base/ActivityState.java",
+    "org/chromium/base/AnimationFrameTimeHistogram.java",
+    "org/chromium/base/annotations/AccessedByNative.java",
+    "org/chromium/base/annotations/CalledByNative.java",
+    "org/chromium/base/annotations/CalledByNativeUnchecked.java",
+    "org/chromium/base/annotations/JNIAdditionalImport.java",
+    "org/chromium/base/annotations/JNINamespace.java",
+    "org/chromium/base/annotations/MainDex.java",
+    "org/chromium/base/annotations/NativeCall.java",
+    "org/chromium/base/annotations/NativeClassQualifiedName.java",
+    "org/chromium/base/annotations/RemovableInRelease.java",
+    "org/chromium/base/annotations/SuppressFBWarnings.java",
+    "org/chromium/base/annotations/UsedByReflection.java",
+    "org/chromium/base/ApiCompatibilityUtils.java",
+    "org/chromium/base/ApkAssets.java",
+    "org/chromium/base/ApplicationStatus.java",
+    "org/chromium/base/BaseChromiumApplication.java",
+    "org/chromium/base/BaseSwitches.java",
+    "org/chromium/base/BuildInfo.java",
+    "org/chromium/base/Callback.java",
+    "org/chromium/base/CollectionUtil.java",
+    "org/chromium/base/CommandLineInitUtil.java",
+    "org/chromium/base/CommandLine.java",
+    "org/chromium/base/ContentUriUtils.java",
+    "org/chromium/base/ContextUtils.java",
+    "org/chromium/base/CpuFeatures.java",
+    "org/chromium/base/EarlyTraceEvent.java",
+    "org/chromium/base/EventLog.java",
+    "org/chromium/base/FieldTrialList.java",
+    "org/chromium/base/FileUtils.java",
+    "org/chromium/base/ImportantFileWriterAndroid.java",
+    "org/chromium/base/JavaHandlerThread.java",
+    "org/chromium/base/JNIUtils.java",
+    "org/chromium/base/library_loader/LegacyLinker.java",
+    "org/chromium/base/library_loader/LibraryLoader.java",
+    "org/chromium/base/library_loader/Linker.java",
+    "org/chromium/base/library_loader/LoaderErrors.java",
+    "org/chromium/base/library_loader/ModernLinker.java",
+    "org/chromium/base/library_loader/NativeLibraryPreloader.java",
+    "org/chromium/base/library_loader/ProcessInitException.java",
+    "org/chromium/base/LocaleUtils.java",
+    "org/chromium/base/Log.java",
+    "org/chromium/base/MemoryPressureListener.java",
+    "org/chromium/base/metrics/RecordHistogram.java",
+    "org/chromium/base/metrics/RecordUserAction.java",
+    "org/chromium/base/multidex/ChromiumMultiDexInstaller.java",
+    "org/chromium/base/ObserverList.java",
+    "org/chromium/base/PackageUtils.java",
+    "org/chromium/base/PathService.java",
+    "org/chromium/base/PathUtils.java",
+    "org/chromium/base/PerfTraceEvent.java",
+    "org/chromium/base/PowerMonitor.java",
+    "org/chromium/base/PowerStatusReceiver.java",
+    "org/chromium/base/Promise.java",
+    "org/chromium/base/ResourceExtractor.java",
+    "org/chromium/base/SecureRandomInitializer.java",
+    "org/chromium/base/StreamUtil.java",
+    "org/chromium/base/SystemMessageHandler.java",
+    "org/chromium/base/SysUtils.java",
+    "org/chromium/base/ThreadUtils.java",
+    "org/chromium/base/TraceEvent.java",
+    "org/chromium/base/VisibleForTesting.java",
+    "org/chromium/net/AndroidCellularSignalStrength.java",
+    "org/chromium/net/AndroidCertVerifyResult.java",
+    "org/chromium/net/AndroidKeyStore.java",
+    "org/chromium/net/AndroidNetworkLibrary.java",
+    "org/chromium/net/AndroidTrafficStats.java",
+    "org/chromium/net/GURLUtils.java",
+    "org/chromium/net/HttpNegotiateAuthenticator.java",
+    "org/chromium/net/HttpNegotiateConstants.java",
+    "org/chromium/net/impl/ChromiumUrlRequestContext.java",
+    "org/chromium/net/impl/ChromiumUrlRequestFactory.java",
+    "org/chromium/net/impl/ChromiumUrlRequest.java",
+    "org/chromium/net/impl/CronetBidirectionalStream.java",
+    "org/chromium/net/impl/CronetLibraryLoader.java",
+    "org/chromium/net/impl/CronetUploadDataStream.java",
+    "org/chromium/net/impl/CronetUrlRequestContext.java",
+    "org/chromium/net/impl/CronetUrlRequest.java",
+    "org/chromium/net/NetStringUtil.java",
+    "org/chromium/net/NetworkChangeNotifierAutoDetect.java",
+    "org/chromium/net/NetworkChangeNotifier.java",
+    "org/chromium/net/ProxyChangeListener.java",
+    "org/chromium/net/RegistrationPolicyAlwaysRegister.java",
+    "org/chromium/net/RegistrationPolicyApplicationStatus.java",
+    "org/chromium/net/urlconnection/CronetBufferedOutputStream.java",
+    "org/chromium/net/urlconnection/CronetChunkedOutputStream.java",
+    "org/chromium/net/urlconnection/CronetFixedModeOutputStream.java",
+    "org/chromium/net/urlconnection/CronetHttpURLConnection.java",
+    "org/chromium/net/urlconnection/CronetHttpURLStreamHandler.java",
+    "org/chromium/net/urlconnection/CronetInputStream.java",
+    "org/chromium/net/urlconnection/CronetOutputStream.java",
+    "org/chromium/net/urlconnection/CronetURLStreamHandlerFactory.java",
+    "org/chromium/net/urlconnection/MessageLoop.java",
+    "org/chromium/net/X509Util.java",
+    "org/chromium/url/IDNStringUtil.java",
+  ]
   jar_path = "$_package_dir/cronet-src.jar"
 }
 
 action("generate_licenses") {
   _license_path = "$_package_dir/LICENSE"
 
   script = "//components/cronet/tools/cronet_licenses.py"
   outputs = [
     _license_path,
   ]
@@ skipping 128 matching lines @@
       ":jar_cronet_api_source",
       ":jar_cronet_other_source",
       ":jar_cronet_sample_source",
       ":repackage_extracted_jars",
     ]
     if (current_cpu == "arm" && arm_version == 7) {
       deps += [ ":enforce_no_neon" ]
     }
   }
 }