Combine base_java.jar, net_java.jar and url_java.jar into cronet.jar

components/cronet.gypi

Index: components/cronet.gypi
diff --git a/components/cronet.gypi b/components/cronet.gypi
index b92cba5695f7f03010b9269da6a230ad1c1cc834..032f839467e0525ff4384f05989361cd23bd5ca0 100644
--- a/components/cronet.gypi
+++ b/components/cronet.gypi
@@ -125,6 +125,15 @@
               'native_lib': 'libcronet.>(android_product_extension)',
               'java_lib': 'cronet.jar',
               'package_dir': '<(PRODUCT_DIR)/cronet',
+              'intermediate_dir': '<(SHARED_INTERMEDIATE_DIR)/cronet',
+              'jar_extract_dir': '<(intermediate_dir)/cronet_jar_extract',
+              'jar_excluded_classes': [
+                '*/Application*.class',
+                '*/BaseChrom*.class',
+                '*/CommandLine*.class',
+              ],
+              'jar_extract_stamp': '<(intermediate_dir)/jar_extract.stamp',
+              'cronet_jar_stamp': '<(intermediate_dir)/cronet_jar.stamp',
           },
           'actions': [
             {
@@ -140,6 +149,44 @@
               ],
             },
             {
+              'action_name': 'extracting from jars',
+              'inputs':  [
+                '<(PRODUCT_DIR)/lib.java/<(java_lib)',
+                '<(PRODUCT_DIR)/lib.java/base_java.jar',
+                '<(PRODUCT_DIR)/lib.java/net_java.jar',
+                '<(PRODUCT_DIR)/lib.java/url_java.jar',
+              ],
+              'outputs': ['<(jar_extract_stamp)', '<(jar_extract_dir)'],
+              'action': [
+                'python',
+                'cronet/tools/extract_from_jars.py',
+                '--classes-dir=<(jar_extract_dir)',
+                '--jars=<@(_inputs)',

[Ryan Sleevi, 2014/05/22 22:16:53]

This doesn't seem right.

<@(_inputs) is going to expand to space separated list, but presumably you want
to quote it? I didn't think <@( handled quoting.

[mef, 2014/05/22 22:28:09]

It gets expanded into this:

[135/138] cd ../../components; python cronet/tools/extract_from_jars.py
"--classes-dir=../out/Debug/gen/cronet/cronet_jar_extract"
"--jars=\"../out/Debug/lib.java/cronet.jar\"
\"../out/Debug/lib.java/base_java.jar\" \"../out/Debug/lib.java/net_java.jar\"
\"../out/Debug/lib.java/url_java.jar\""
"--stamp=../out/Debug/gen/cronet/jar_extract.stamp"

The python script then iterates over |jars|.

[Ryan Sleevi, 2014/05/22 22:59:34]

Ah, it's a bit of a side-effect of how the args are being specified, that's
forcing an outer-quoting.

The only reason --jars is being quoted is because of how <() is being expanded.

That is, one would normally do 'something' like
['--classes-dir', '<(jar_extract_dir)', '--jars', '<@(_inputs)', '--stamp',
'<(jar_extract_stamp)']

This would be expanded as
python cronet/tools/extract_from_jars.py --classes-dir
"../out/Debug/gen/cronet/cronet_jar_extract" --jars "cronet.jar" "base_java.jar"
"net_java.jar" "url_java.jar" --stamp "jar_extract.stamp"

Which would screw up the processing of --jars, because the entire string wasn't
quoted (just the individual path components)

[mef, 2014/05/23 15:49:08]

 I see, thanks for the explanation!

+                '--stamp=<(jar_extract_stamp)',
+              ],
+            },
+            {
+              'action_name': 'jar_<(_target_name)',
+              'message': 'Creating <(_target_name) jar',
+              'inputs': [
+                '<(DEPTH)/build/android/gyp/util/build_utils.py',
+                '<(DEPTH)/build/android/gyp/util/md5_check.py',
+                '<(DEPTH)/build/android/gyp/jar.py',
+                '<(jar_extract_stamp)',
+              ],
+              'outputs': [
+                '<(package_dir)/<(java_lib)',
+                '<(cronet_jar_stamp)',
+              ],
+              'action': [
+                'python', '<(DEPTH)/build/android/gyp/jar.py',
+                '--classes-dir=<(jar_extract_dir)',
+                '--jar-path=<(package_dir)/<(java_lib)',
+                '--excluded-classes=<(jar_excluded_classes)',

[Ryan Sleevi, 2014/05/22 22:16:53]

Why <( vs <@( here?

[mef, 2014/05/22 22:28:09]

Um, I'm not sure. I took it from here:
https://code.google.com/p/chromium/codesearch#chromium/src/build/java.gypi&l=310

What is <( vs <@(?

It gets expanded into this: 

[137/138] cd ../../components; python ../build/android/gyp/jar.py
"--classes-dir=../out/Debug/gen/cronet/cronet_jar_extract"
"--jar-path=../out/Debug/cronet/cronet.jar"
"--excluded-classes=\"*/Application*.class\" \"*/BaseChrom*.class\"
\"*/CommandLine*.class\"" "--stamp=../out/Debug/gen/cronet/cronet_jar.stamp"

[Ryan Sleevi, 2014/05/22 22:59:34]

<() vs <@() is list-expansion versus string expansion

<() of ["foo", "bar", "baz"] would result in "foo bar baz".
<@() of ["foo", "bar", "baz"] would result in "foo" "bar" "baz"

In this case, since it's part of a string, it doesn't matter. <@() is more
idiomatic for list expansion though.

[mef, 2014/05/23 15:49:08]

Done.

+                '--stamp=<(cronet_jar_stamp)',
+              ]
+            },
+            {
               'action_name': 'generate licenses',
               'inputs':  ['cronet/tools/cronet_licenses.py'] ,
               'outputs': ['<(package_dir)/LICENSE'],
@@ -157,10 +204,6 @@
               'files': [
                 '../AUTHORS',
                 '../chrome/VERSION',
-                '<(PRODUCT_DIR)/lib.java/<(java_lib)',
-                '<(PRODUCT_DIR)/lib.java/base_java.jar',
-                '<(PRODUCT_DIR)/lib.java/net_java.jar',
-                '<(PRODUCT_DIR)/lib.java/url_java.jar',
               ],
             },
           ],