Index: components/cronet.gypi |
diff --git a/components/cronet.gypi b/components/cronet.gypi |
index b45aeda7c4de0b1afe2c2ae49d3532cdd4435215..28fc5a0bb74de5b734c8bdbf6cebd37f3e2d4d31 100644 |
--- a/components/cronet.gypi |
+++ b/components/cronet.gypi |
@@ -380,7 +380,9 @@ |
'type': 'none', |
'dependencies': [ |
'cronet_java', |
+ 'netty-tcnative', |
mef
2016/01/21 17:02:55
Would it be enough to just depend on
'../third_pa
kapishnikov
2016/01/21 19:43:30
Done.
|
'../net/net.gyp:net_java_test_support', |
+ '../third_party/netty4/netty.gyp:netty_all', |
], |
'variables': { |
'apk_name': 'CronetTest', |
@@ -389,6 +391,9 @@ |
'asset_location': 'cronet/android/test/assets', |
'native_lib_target': 'libcronet_tests', |
'run_findbugs': 1, |
+ 'additional_bundled_libs': [ |
+ '<(PRODUCT_DIR)/lib/libnetty-tcnative.so', |
+ ], |
}, |
'includes': [ '../build/java_apk.gypi' ], |
}, |
@@ -471,6 +476,14 @@ |
'../build/apk_test.gypi', |
], |
}, |
+ { # builds libnetty-tcnative.so & netty-tcnative.jar |
+ 'target_name': 'netty-tcnative', |
+ 'type': 'none', |
+ 'dependencies': [ |
+ '../third_party/netty-tcnative/netty-tcnative.gyp:netty-tcnative-so', |
+ '../third_party/netty-tcnative/netty-tcnative.gyp:netty-tcnative', |
+ ], |
+ }, |
{ |
'target_name': 'cronet_package', |
'type': 'none', |