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..9a899be650771c86e54e7de2112f9d12b7328f1f 100644
--- a/components/cronet.gypi
+++ b/components/cronet.gypi
@@ -125,6 +125,13 @@
               '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': [
+                '*/BaseChromiumApp*.class',
+              ],
+              'jar_extract_stamp': '<(intermediate_dir)/jar_extract.stamp',
+              'cronet_jar_stamp': '<(intermediate_dir)/cronet_jar.stamp',
           },
           'actions': [
             {
@@ -140,6 +147,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)',
+                '--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)',
+                '--stamp=<(cronet_jar_stamp)',
+              ]
+            },
+            {
               'action_name': 'generate licenses',
               'inputs':  ['cronet/tools/cronet_licenses.py'] ,
               'outputs': ['<(package_dir)/LICENSE'],
@@ -157,10 +202,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',
               ],
             },
           ],