GN: Allow java_* to set their .jar name

components/cronet/android/BUILD.gn

Index: components/cronet/android/BUILD.gn
diff --git a/components/cronet/android/BUILD.gn b/components/cronet/android/BUILD.gn
index 933ee62b952823fb720f401e35f41df15cc0b232..5d1a68f85a36d74b56ac0e6fb4a43aabe701daeb 100644
--- a/components/cronet/android/BUILD.gn
+++ b/components/cronet/android/BUILD.gn
@@ -264,8 +264,8 @@ shared_library("cronet") {
 
 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",
@@ -318,7 +318,7 @@ android_library("cronet_impl_common_java") {
   ]
 
   deps = [
-    ":cronet_api",
+    ":cronet_api_java",
     "//third_party/android_tools:android_support_annotations_java",
   ]
 
@@ -334,7 +334,7 @@ android_library("cronet_impl_platform_java") {
   ]
 
   deps = [
-    ":cronet_api",
+    ":cronet_api_java",
     ":cronet_impl_common_java",
   ]
 }
@@ -367,7 +367,7 @@ android_library("cronet_impl_native_java") {
   ]
 
   deps = [
-    ":cronet_api",
+    ":cronet_api_java",
     ":cronet_impl_common_java",
     "//base:base_java",
     "//net/android:net_java",
@@ -402,7 +402,7 @@ android_library("cronet_sample_apk_java") {
   ]
 
   deps = [
-    ":cronet_api",
+    ":cronet_api_java",
     ":cronet_impl_all_java",
     ":cronet_sample_apk_resources",
     "//base:base_java",
@@ -455,7 +455,7 @@ instrumentation_test_apk("cronet_sample_test_apk") {
   ]
 
   deps = [
-    ":cronet_api",
+    ":cronet_api_java",
     ":cronet_impl_all_java",
     ":cronet_sample_apk_java",
     ":cronet_sample_test_apk_resources",
@@ -563,7 +563,7 @@ android_library("cronet_test_apk_java") {
   ]
 
   deps = [
-    ":cronet_api",
+    ":cronet_api_java",
     ":cronet_impl_all_java",
     "//base:base_java",
     "//base:base_java_test_support",
@@ -672,7 +672,7 @@ android_library("cronet_javatests") {
   ]
 
   deps = [
-    ":cronet_api",
+    ":cronet_api_java",
     ":cronet_impl_all_java",
     ":cronet_test_apk_java",
     "//base:base_java",
@@ -690,7 +690,7 @@ instrumentation_test_apk("cronet_test_instrumentation_apk") {
   android_manifest = "test/javatests/AndroidManifest.xml"
 
   deps = [
-    ":cronet_api",
+    ":cronet_api_java",
     ":cronet_impl_all_java",
     ":cronet_javatests",
     ":cronet_test_apk_java",
@@ -714,7 +714,7 @@ android_library("cronet_perf_test_apk_java") {
       [ "test/javaperftests/src/org/chromium/net/CronetPerfTestActivity.java" ]
 
   deps = [
-    ":cronet_api",
+    ":cronet_api_java",
     ":cronet_impl_all_java",
     ":cronet_javatests",
     ":cronet_test_apk_java",
@@ -900,7 +900,7 @@ template("jar_src") {
 
 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"
 }
@@ -1004,9 +1004,8 @@ action("generate_javadoc") {
   ]
 }
 
-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",
@@ -1017,12 +1016,24 @@ copy("cronet_package_copy") {
   ]
 
   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 = [
@@ -1091,7 +1102,8 @@ group("cronet_package") {
   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",