GN: Allow java_* to set their .jar name

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/process_version.gni")
 import("//build/util/version.gni")
 import("//testing/test.gni")
@@ skipping 246 matching lines @@
               rebase_path("//components/cronet/android/only_jni_exports.lst") ]
 
   # 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_srcjar_deps = [ ":cronet_api_version_srcjar" ]
 
-# cronet_api.jar defines Cronet API.
-android_library("cronet_api") {
+# cronet_api_java.jar defines Cronet API.
+android_library("cronet_api_java") {

[mef, 2016/11/04 20:17:05]

Would it be possible/better to override name of output jar file, so it will
continue to be called cronet_api.jar?

[agrieve, 2016/11/08 17:44:25]

Great idea. Done!

   java_files = [
     "api/src/org/chromium/net/BidirectionalStream.java",
     "api/src/org/chromium/net/CronetEngine.java",
     "api/src/org/chromium/net/CronetException.java",
     "api/src/org/chromium/net/ICronetEngineBuilder.java",
     "api/src/org/chromium/net/ImplLoader.java",
     "api/src/org/chromium/net/ExperimentalBidirectionalStream.java",
     "api/src/org/chromium/net/ExperimentalCronetEngine.java",
     "api/src/org/chromium/net/ExperimentalUrlRequest.java",
     "api/src/org/chromium/net/InlineExecutionProhibitedException.java",
@@ skipping 32 matching lines @@
   java_files = [
     "java/src/org/chromium/net/impl/CronetEngineBase.java",
     "java/src/org/chromium/net/impl/CronetEngineBuilderImpl.java",
     "java/src/org/chromium/net/impl/Preconditions.java",
     "java/src/org/chromium/net/impl/UrlRequestBase.java",
     "java/src/org/chromium/net/impl/UrlRequestBuilderImpl.java",
     "java/src/org/chromium/net/impl/UserAgent.java",
   ]
 
   deps = [
-    ":cronet_api",
+    ":cronet_api_java",
     "//third_party/android_tools:android_support_annotations_java",
   ]
 
   srcjar_deps = cronet_impl_common_java_srcjar_deps
 }
 
 # cronet_impl_platform_java.jar - Java platform based implementation of the Cronet engine.
 android_library("cronet_impl_platform_java") {
   java_files = [
     "java/src/org/chromium/net/impl/InputStreamChannel.java",
     "java/src/org/chromium/net/impl/JavaCronetEngine.java",
     "java/src/org/chromium/net/impl/JavaUrlRequest.java",
   ]
 
   deps = [
-    ":cronet_api",
+    ":cronet_api_java",
     ":cronet_impl_common_java",
   ]
 }
 
 cronet_impl_native_java_srcjar_deps = [
   ":net_request_priority_java",
   ":network_quality_observation_source_java",
   ":url_request_error_java",
 ]
 
@@ skipping 12 matching lines @@
     "java/src/org/chromium/net/urlconnection/CronetFixedModeOutputStream.java",
     "java/src/org/chromium/net/urlconnection/CronetHttpURLConnection.java",
     "java/src/org/chromium/net/urlconnection/CronetHttpURLStreamHandler.java",
     "java/src/org/chromium/net/urlconnection/CronetInputStream.java",
     "java/src/org/chromium/net/urlconnection/CronetOutputStream.java",
     "java/src/org/chromium/net/urlconnection/CronetURLStreamHandlerFactory.java",
     "java/src/org/chromium/net/urlconnection/MessageLoop.java",
   ]
 
   deps = [
-    ":cronet_api",
+    ":cronet_api_java",
     ":cronet_impl_common_java",
     "//base:base_java",
     "//net/android:net_java",
     "//third_party/android_tools:android_support_annotations_java",
     "//third_party/jsr-305:jsr_305_javalib",
   ]
 
   srcjar_deps = cronet_impl_native_java_srcjar_deps
 }
 
@@ skipping 14 matching lines @@
   ]
 }
 
 android_library("cronet_sample_apk_java") {
   java_files = [
     "sample/src/org/chromium/cronet_sample_apk/CronetSampleActivity.java",
     "sample/src/org/chromium/cronet_sample_apk/CronetSampleApplication.java",
   ]
 
   deps = [
-    ":cronet_api",
+    ":cronet_api_java",
     ":cronet_impl_all_java",
     ":cronet_sample_apk_resources",
     "//base:base_java",
     "//third_party/android_tools:android_support_v7_appcompat_java",
   ]
 
   run_findbugs_override = true
 }
 
 android_apk("cronet_sample_apk") {
@@ skipping 32 matching lines @@
 instrumentation_test_apk("cronet_sample_test_apk") {
   apk_name = "CronetSampleTest"
   apk_under_test = ":cronet_sample_apk"
   android_manifest = "sample/javatests/AndroidManifest.xml"
   java_files = [
     "sample/javatests/src/org/chromium/cronet_sample_apk/Criteria.java",
     "sample/javatests/src/org/chromium/cronet_sample_apk/CronetSampleTest.java",
   ]
 
   deps = [
-    ":cronet_api",
+    ":cronet_api_java",
     ":cronet_impl_all_java",
     ":cronet_sample_apk_java",
     ":cronet_sample_test_apk_resources",
     "//base:base_java",
     "//base:base_java_test_support",
     "//net/android:net_java_test_support",
   ]
   additional_apks = [ "//net/android:net_test_support_apk" ]
 
   run_findbugs_override = true
@@ skipping 87 matching lines @@
     "test/src/org/chromium/net/MockUrlRequestJobFactory.java",
     "test/src/org/chromium/net/NativeTestServer.java",
     "test/src/org/chromium/net/NetworkChangeNotifierUtil.java",
     "test/src/org/chromium/net/QuicTestServer.java",
     "test/src/org/chromium/net/SdchObserver.java",
     "test/src/org/chromium/net/TestFilesInstaller.java",
     "test/src/org/chromium/net/TestUploadDataStreamHandler.java",
   ]
 
   deps = [
-    ":cronet_api",
+    ":cronet_api_java",
     ":cronet_impl_all_java",
     "//base:base_java",
     "//base:base_java_test_support",
     "//net/android:net_java_test_support",
     "//third_party/netty-tcnative:netty-tcnative",
     "//third_party/netty4:netty_all",
   ]
 
   run_findbugs_override = true
 }
@@ skipping 88 matching lines @@
     "test/javatests/src/org/chromium/net/urlconnection/CronetHttpURLConnectionTest.java",
     "test/javatests/src/org/chromium/net/urlconnection/CronetHttpURLStreamHandlerTest.java",
     "test/javatests/src/org/chromium/net/urlconnection/CronetURLStreamHandlerFactoryTest.java",
     "test/javatests/src/org/chromium/net/urlconnection/MessageLoopTest.java",
     "test/javatests/src/org/chromium/net/urlconnection/QuicUploadTest.java",
     "test/javatests/src/org/chromium/net/urlconnection/TestUtil.java",
     "test/javatests/src/org/chromium/net/UrlResponseInfoTest.java",
   ]
 
   deps = [
-    ":cronet_api",
+    ":cronet_api_java",
     ":cronet_impl_all_java",
     ":cronet_test_apk_java",
     "//base:base_java",
     "//base:base_java_test_support",
     "//net/android:net_java",
     "//net/android:net_java_test_support",
   ]
 
   run_findbugs_override = true
 }
 
 instrumentation_test_apk("cronet_test_instrumentation_apk") {
   apk_name = "CronetTestInstrumentation"
   apk_under_test = ":cronet_test_apk"
   android_manifest = "test/javatests/AndroidManifest.xml"
 
   deps = [
-    ":cronet_api",
+    ":cronet_api_java",
     ":cronet_impl_all_java",
     ":cronet_javatests",
     ":cronet_test_apk_java",
     "//base:base_java",
     "//base:base_java_test_support",
     "//net/android:net_java",
     "//net/android:net_java_test_support",
   ]
   additional_apks = [ "//net/android:net_test_support_apk" ]
 
   data_deps = [
     "//net:test_support",
   ]
 
   run_findbugs_override = true
 }
 
 android_library("cronet_perf_test_apk_java") {
   testonly = true
   java_files =
       [ "test/javaperftests/src/org/chromium/net/CronetPerfTestActivity.java" ]
 
   deps = [
-    ":cronet_api",
+    ":cronet_api_java",
     ":cronet_impl_all_java",
     ":cronet_javatests",
     ":cronet_test_apk_java",
     "//base:base_java",
   ]
 
   run_findbugs_override = true
 }
 
 android_apk("cronet_perf_test_apk") {
@@ skipping 165 matching lines @@
     args += [ "--src-list-files=${_src_list_files}" ]
 
     inputs = _src_jars
     inputs += _src_files
     inputs += _src_list_files
   }
 }
 
 jar_src("jar_cronet_api_source") {
   src_search_dirs = [ "api/src" ]
-  source_deps = [ ":cronet_api" ]
+  source_deps = [ ":cronet_api_java" ]
   srcjar_deps = cronet_api_srcjar_deps
   jar_path = "$_package_dir/cronet_api-src.jar"
 }
 
 jar_src("jar_cronet_impl_common_java_source") {
   src_search_dirs = [ "java/src" ]
   source_deps = [ ":cronet_impl_common_java" ]
   srcjar_deps = cronet_impl_common_java_srcjar_deps
   jar_path = "$_package_dir/cronet_impl_common_java-src.jar"
 }
@@ skipping 83 matching lines @@
 
     # JavaDoc is generated from Cronet's API source jar.
     "--input-src-jar",
     rebase_path("$_package_dir/cronet_api-src.jar", root_build_dir),
   ]
   deps = [
     ":jar_cronet_api_source",
   ]
 }
 
-copy("cronet_package_copy") {
+copy("cronet_package_copy_main") {
   sources = [
-    "$root_out_dir/lib.java/components/cronet/android/cronet_api.jar",
     "$root_out_dir/lib.java/components/cronet/android/cronet_impl_common_java.jar",
     "$root_out_dir/lib.java/components/cronet/android/cronet_impl_platform_java.jar",
     "//AUTHORS",
     "//chrome/VERSION",
   ]
   outputs = [
     "$_package_dir/{{source_file_part}}",
   ]
 
   deps = [
-    ":cronet_api",
     ":cronet_impl_common_java",
     ":cronet_impl_platform_java",
   ]
 }
 
+copy("cronet_package_copy_api") {
+  sources = [
+    "$root_out_dir/lib.java/components/cronet/android/cronet_api_java.jar",
+  ]
+  outputs = [
+    "$_package_dir/cronet_api.jar",
+  ]
+
+  deps = [
+    ":cronet_api_java",
+  ]
+}
+
 action("cronet_combine_proguard_flags") {
   script = "//components/cronet/tools/generate_proguard_file.py"
   outputs = [
     "$_package_dir/proguard.cfg",
   ]
 
   args = [
     "--output-file",
     rebase_path("$_package_dir/proguard.cfg", root_build_dir),
     rebase_path("//base/android/proguard/chromium_code.flags", root_build_dir),
@@ skipping 48 matching lines @@
     ]
   }
 }
 
 group("cronet_package") {
   # Enforce that arm_use_neon==false when building for ARMv7 by
   # not including any deps in cronet_package target otherwise.
   if (!(target_cpu == "arm" && arm_version == 7) || !arm_use_neon) {
     deps = [
       ":cronet_combine_proguard_flags",
-      ":cronet_package_copy",
+      ":cronet_package_copy_api",
+      ":cronet_package_copy_main",
       ":cronet_package_copy_native_lib",
       ":cronet_package_copy_native_lib_unstripped",
       ":generate_javadoc",
       ":generate_licenses",
       ":jar_cronet_api_source",
       ":jar_cronet_impl_common_java_source",
       ":jar_cronet_impl_native_java_source",
       ":jar_cronet_impl_platform_java_source",
       ":jar_cronet_sample_source",
       ":repackage_extracted_jars",
     ]
     if (current_cpu == "arm" && arm_version == 7) {
       deps += [ ":enforce_no_neon" ]
     }
   }
 }