[third-party] Netty fork of Tomcat Native

components/cronet.gypi

Index: components/cronet.gypi
diff --git a/components/cronet.gypi b/components/cronet.gypi
index b45aeda7c4de0b1afe2c2ae49d3532cdd4435215..4b0dbb34fcc2d445b1f5dd810da41554cfc60a50 100644
--- a/components/cronet.gypi
+++ b/components/cronet.gypi
@@ -381,6 +381,8 @@
           'dependencies': [
             'cronet_java',
             '../net/net.gyp:net_java_test_support',
+            '../third_party/netty-tcnative/netty-tcnative.gyp:netty-tcnative',
+            '../third_party/netty4/netty.gyp:netty_all',
           ],
           'variables': {
             'apk_name': 'CronetTest',
@@ -389,10 +391,38 @@
             'asset_location': 'cronet/android/test/assets',
             'native_lib_target': 'libcronet_tests',
             'run_findbugs': 1,
+            'additional_bundled_libs': [
+              '<(PRODUCT_DIR)/lib/<(target_netty_tcnative_so_file_name)',
+            ],
           },
           'includes': [ '../build/java_apk.gypi' ],
         },
         {
+          # libnetty-tcnative shared library should have a specific name when it is copied to

[mef, 2016/01/26 22:36:48]

is it possible to have this target in netty-tcnative gyp?

[kapishnikov, 2016/01/27 00:46:06]

Done.

+          # the test APK. This target renames (actually makes a copy of) the 'so' file if it has
+          # a different name.
+          'target_name': 'rename_netty_tcnative_so_file',
+          'type': 'none',
+          'target_conditions': [
+            ['">(netty_tcnative_so_file_name)"!="<(target_netty_tcnative_so_file_name)"', {
+              'actions': [
+              {
+                'action_name': 'rename',
+                'inputs': ['<(PRODUCT_DIR)/lib/>(netty_tcnative_so_file_name)'],
+                'outputs': ['<(PRODUCT_DIR)/lib/<(target_netty_tcnative_so_file_name)'],
+                'action': [
+                  'cp',
+                  '<@(_inputs)',
+                  '<@(_outputs)',
+                ],
+              }],
+           }],
+          ],
+          'dependencies': [
+            '../third_party/netty-tcnative/netty-tcnative.gyp:netty-tcnative-so',
+          ],
+        },
+        {
           # cronet_test_apk creates a .jar as a side effect. Any java targets
           # that need that .jar in their classpath should depend on this target,
           # cronet_test_apk_java. Dependents of cronet_test_apk receive its
@@ -627,6 +657,7 @@
       ],
       'variables': {
         'enable_data_reduction_proxy_support%': 0,
+        'target_netty_tcnative_so_file_name': "libnetty-tcnative.so",
       },
     }],  # OS=="android"
   ],