Switched to new versions of netty and tcnative

third_party/netty-tcnative/BUILD.gn

Index: third_party/netty-tcnative/BUILD.gn
diff --git a/third_party/netty-tcnative/BUILD.gn b/third_party/netty-tcnative/BUILD.gn
index 9fecf9c1f0d9540ca1b3ae1a507273712065aecc..521a81ad72f849a90fb55aad5fdf8e754df4ca5f 100644
--- a/third_party/netty-tcnative/BUILD.gn
+++ b/third_party/netty-tcnative/BUILD.gn
@@ -11,37 +11,15 @@ import("//build/config/android/rules.gni")
 shared_library("netty-tcnative-so") {
   output_name = "netty-tcnative"
   sources = [
-    "src/c/address.c",
     "src/c/bb.c",
-    "src/c/dir.c",
     "src/c/error.c",
-    "src/c/file.c",
-    "src/c/info.c",
     "src/c/jnilib.c",
-    "src/c/lock.c",
-    "src/c/misc.c",
-    "src/c/mmap.c",
-    "src/c/multicast.c",
-    "src/c/network.c",
-    "src/c/os.c",
-    "src/c/os_unix_system.c",
-    "src/c/os_unix_uxpipe.c",
-    "src/c/poll.c",
-    "src/c/pool.c",
-    "src/c/proc.c",
-    "src/c/shm.c",
+    "src/c/native_constants.c",
     "src/c/ssl.c",
     "src/c/ssl_private.h",
     "src/c/sslcontext.c",
-    "src/c/sslinfo.c",
-    "src/c/sslnetwork.c",
     "src/c/sslutils.c",
-    "src/c/stdlib.c",
     "src/c/tcn.h",
-    "src/c/tcn_api.h",
-    "src/c/tcn_version.h",
-    "src/c/thread.c",
-    "src/c/user.c",
   ]
   include_dirs = [ "../apache-portable-runtime/src/include" ]
   defines = [ "HAVE_OPENSSL" ]
@@ -56,47 +34,14 @@ shared_library("netty-tcnative-so") {
 # Builds the Java part of netty-tcnative library.
 android_library("netty-tcnative_java") {
   java_files = [
-    "src/java/src/org/apache/tomcat/Apr.java",
-    "src/java/src/org/apache/tomcat/jni/Address.java",
-    "src/java/src/org/apache/tomcat/jni/BIOCallback.java",
-    "src/java/src/org/apache/tomcat/jni/Buffer.java",
-    "src/java/src/org/apache/tomcat/jni/CertificateVerifier.java",
-    "src/java/src/org/apache/tomcat/jni/Directory.java",
-    "src/java/src/org/apache/tomcat/jni/Error.java",
-    "src/java/src/org/apache/tomcat/jni/FileInfo.java",
-    "src/java/src/org/apache/tomcat/jni/File.java",
-    "src/java/src/org/apache/tomcat/jni/Global.java",
-    "src/java/src/org/apache/tomcat/jni/Library.java",
-    "src/java/src/org/apache/tomcat/jni/LibraryNotFoundError.java",
-    "src/java/src/org/apache/tomcat/jni/Local.java",
-    "src/java/src/org/apache/tomcat/jni/Lock.java",
-    "src/java/src/org/apache/tomcat/jni/Mmap.java",
-    "src/java/src/org/apache/tomcat/jni/Multicast.java",
-    "src/java/src/org/apache/tomcat/jni/OS.java",
-    "src/java/src/org/apache/tomcat/jni/PasswordCallback.java",
-    "src/java/src/org/apache/tomcat/jni/Poll.java",
-    "src/java/src/org/apache/tomcat/jni/PoolCallback.java",
-    "src/java/src/org/apache/tomcat/jni/Pool.java",
-    "src/java/src/org/apache/tomcat/jni/Procattr.java",
-    "src/java/src/org/apache/tomcat/jni/ProcErrorCallback.java",
-    "src/java/src/org/apache/tomcat/jni/Proc.java",
-    "src/java/src/org/apache/tomcat/jni/Registry.java",
-    "src/java/src/org/apache/tomcat/jni/SessionTicketKey.java",
-    "src/java/src/org/apache/tomcat/jni/Shm.java",
-    "src/java/src/org/apache/tomcat/jni/Sockaddr.java",
-    "src/java/src/org/apache/tomcat/jni/socket/AprSocketContext.java",
-    "src/java/src/org/apache/tomcat/jni/socket/AprSocket.java",
-    "src/java/src/org/apache/tomcat/jni/socket/HostInfo.java",
-    "src/java/src/org/apache/tomcat/jni/Socket.java",
-    "src/java/src/org/apache/tomcat/jni/SSLContext.java",
-    "src/java/src/org/apache/tomcat/jni/SSLExt.java",
-    "src/java/src/org/apache/tomcat/jni/SSL.java",
-    "src/java/src/org/apache/tomcat/jni/SSLSocket.java",
-    "src/java/src/org/apache/tomcat/jni/Status.java",
-    "src/java/src/org/apache/tomcat/jni/Stdlib.java",
-    "src/java/src/org/apache/tomcat/jni/Thread.java",
-    "src/java/src/org/apache/tomcat/jni/Time.java",
-    "src/java/src/org/apache/tomcat/jni/User.java",
+    "src/java/io/netty/internal/tcnative/Buffer.java",
+    "src/java/io/netty/internal/tcnative/CertificateRequestedCallback.java",
+    "src/java/io/netty/internal/tcnative/CertificateVerifier.java",
+    "src/java/io/netty/internal/tcnative/Library.java",
+    "src/java/io/netty/internal/tcnative/NativeStaticallyReferencedJniMethods.java",
+    "src/java/io/netty/internal/tcnative/SessionTicketKey.java",
+    "src/java/io/netty/internal/tcnative/SSL.java",
+    "src/java/io/netty/internal/tcnative/SSLContext.java",
   ]
   run_findbugs_override = false
   deps = [