Split cronet.jar into cronet.jar and cronet_api.jar, preserve full libcronet.so

components/cronet.gypi

 # Copyright 2014 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.
 
 {
   'conditions': [
     ['OS=="android" and use_icu_alternatives_on_android==1', {
       # TODO(mef): Figure out what needs to be done for gn script.
       'targets': [
         {
@@ skipping 134 matching lines @@
             [ 'use_icu_alternatives_on_android == 1', {
                 'dependencies!': [
                   '../base/base.gyp:base_i18n',
                   '../third_party/icu/icu.gyp:icui18n',
                   '../third_party/icu/icu.gyp:icuuc',
                 ]
               },
             ],
           ],
         },
-        {
+        { # cronet_stub.jar defines HttpUrlRequest interface and provides its
+          # its implementation using HttpUrlConnection.

[mmenke, 2014/08/12 16:40:14]

Maybe add "(Not the Chromium network stack)"

[mmenke, 2014/08/12 16:40:15]

nit:  Don't use tabs.

[mef, 2014/08/12 17:30:35]

Oops. I swear it is vi's fault. :) Done.

+          'target_name': 'cronet_stub',
+          'type': 'none',
+          'dependencies': [
+            'cronet_url_request_context_config_list',
+            'cronet_version',
+          ],
+          'variables': {
+            'java_in_dir': 'cronet/android/java',
+            'javac_includes': [
+              '**/ChunkedWritableByteChannel.java',
+              '**/HttpUrlConnection*.java',
+              '**/HttpUrlRequest*.java',
+              '**/ResponseTooLargeException.java',
+              '**/UserAgent.java',
+              # TODO(mef): Consider moving this into HttpUrlRequestConfig.
+              '**/UrlRequestContextConfig.java',
+              '**/Version.java',
+            ],
+          },
+          'includes': [ '../build/java.gypi' ],
+        },
+        { # cronet.jar implements HttpUrlRequest interface using Chromium stack
+          # in native libcronet.so library.

[mmenke, 2014/08/12 16:40:14]

nit:  Don't use tabs.

[mef, 2014/08/12 17:30:35]

Done.

           'target_name': 'cronet',
           'type': 'none',
           'dependencies': [
             '../base/base.gyp:base',
-            'libcronet',
+            'cronet_stub',
             'cronet_url_request_error_list',
             'cronet_url_request_priority_list',
+            'libcronet',
           ],
           'variables': {
             'java_in_dir': 'cronet/android/java',
+            'javac_includes': [
+              '**/ChromiumUrlRequest.java',
+              '**/ChromiumUrlRequestFactory.java',
+              '**/LibraryLoader.java',
+              # TODO(mef): Merge UrlRequest*.java into ChromiumUrlRequest*.java
+              '**/UrlRequest.java',
+              '**/UrlRequestContext.java',
+              '**/UrlRequestError.java',
+              '**/UrlRequestPriority.java',
+              '**/UsedByReflection.java',
+            ],
           },
           'includes': [ '../build/java.gypi' ],
         },
         {
           'target_name': 'cronet_package',
           'type': 'none',
           'dependencies': [
             'libcronet',
             'cronet',
+            'cronet_stub',
           ],
           'variables': {
               'native_lib': 'libcronet.>(android_product_extension)',
               'java_lib': 'cronet.jar',
+              'java_stub_lib': 'cronet_stub.jar',
               'java_src_lib': 'cronet-src.jar',
               'java_sample_src_lib': 'cronet-sample-src.jar',
+              'lib_java_dir': '<(PRODUCT_DIR)/lib.java',
               'package_dir': '<(PRODUCT_DIR)/cronet',
               'intermediate_dir': '<(SHARED_INTERMEDIATE_DIR)/cronet',
               'jar_extract_dir': '<(intermediate_dir)/cronet_jar_extract',
               'jar_excluded_classes': [
                 '*/library_loader/*',
               ],
               'jar_extract_stamp': '<(intermediate_dir)/jar_extract.stamp',
               'cronet_jar_stamp': '<(intermediate_dir)/cronet_jar.stamp',
           },
           'actions': [
             {
               'action_name': 'strip libcronet',
               'inputs': ['<(SHARED_LIB_DIR)/<(native_lib)'],
               'outputs': ['<(package_dir)/libs/<(android_app_abi)/<(native_lib)'],
               'action': [
                 '<(android_strip)',
                 '--strip-unneeded',
                 '<@(_inputs)',
                 '-o',
                 '<@(_outputs)',
               ],
             },
             {
               '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',
+                '<(lib_java_dir)/<(java_lib)',
+                '<(lib_java_dir)/base_java.jar',
+                '<(lib_java_dir)/net_java.jar',
+                '<(lib_java_dir)/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)',
               ],
             },
@@ skipping 52 matching lines @@
               ],
             },
           ],
           'copies': [
             {
               'destination': '<(package_dir)',
               'files': [
                 '../AUTHORS',
                 '../chrome/VERSION',
                 'cronet/android/proguard.cfg',
+                '<(lib_java_dir)/<(java_stub_lib)'
+              ],
+            },
+            {
+              'destination': '<(package_dir)/symbols/<(android_app_abi)',
+              'files': [
+                '<(SHARED_LIB_DIR)/<(native_lib)',
               ],
             },
           ],
         },
         {
           'target_name': 'cronet_sample_apk',
           'type': 'none',
           'dependencies': [
             'cronet',
           ],
@@ skipping 35 matching lines @@
             'java_in_dir': 'cronet/android/sample/javatests',
             'resource_dir': 'cronet/android/sample/res',
             'is_test_apk': 1,
           },
           'includes': [ '../build/java_apk.gypi' ],
         },
       ],
     }],  # OS=="android"
   ],
 }