From be52e412dae9e4f037626e6a53e70666c83f39b7 Mon Sep 17 00:00:00 2001
From: Tomo Suzuki <suztomo@google.com>
Date: Wed, 17 Mar 2021 11:25:41 -0400
Subject: [PATCH 1/2] Upgrading netty-tcnative to 2.0.36.Final for ARM

Netty-tcnative was not working for aarch64 before 2.0.36.Final
https://github.com/netty/netty-tcnative/issues/552#issuecomment-781921125
---
 build.gradle     | 2 +-
 repositories.bzl | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 5c605dcab37..f320c2926ab 100644
--- a/build.gradle
+++ b/build.gradle
@@ -176,7 +176,7 @@ subprojects {
             // SECURITY.md (multiple occurrences)
             // examples/example-tls/build.gradle
             // examples/example-tls/pom.xml
-            netty_tcnative: 'io.netty:netty-tcnative-boringssl-static:2.0.34.Final',
+            netty_tcnative: 'io.netty:netty-tcnative-boringssl-static:2.0.36.Final',
 
             conscrypt: 'org.conscrypt:conscrypt-openjdk-uber:2.5.1',
             re2j: 'com.google.re2j:re2j:1.5',
diff --git a/repositories.bzl b/repositories.bzl
index 3ed5291a88b..cd07cd1f526 100644
--- a/repositories.bzl
+++ b/repositories.bzl
@@ -32,7 +32,7 @@ IO_GRPC_GRPC_JAVA_ARTIFACTS = [
     "io.netty:netty-handler-proxy:4.1.52.Final",
     "io.netty:netty-handler:4.1.52.Final",
     "io.netty:netty-resolver:4.1.52.Final",
-    "io.netty:netty-tcnative-boringssl-static:2.0.34.Final",
+    "io.netty:netty-tcnative-boringssl-static:2.0.36.Final",
     "io.netty:netty-transport-native-epoll:jar:linux-x86_64:4.1.52.Final",
     "io.netty:netty-transport:4.1.52.Final",
     "io.opencensus:opencensus-api:0.24.0",

From 66b6016fbc2ade49db08167400935497861dd4f4 Mon Sep 17 00:00:00 2001
From: Tomo Suzuki <suztomo@google.com>
Date: Wed, 17 Mar 2021 11:33:29 -0400
Subject: [PATCH 2/2] Removing unused variable

---
 examples/example-xds/build.gradle | 1 -
 1 file changed, 1 deletion(-)

diff --git a/examples/example-xds/build.gradle b/examples/example-xds/build.gradle
index 4449ec2ce2b..885daa2edb5 100644
--- a/examples/example-xds/build.gradle
+++ b/examples/example-xds/build.gradle
@@ -23,7 +23,6 @@ targetCompatibility = 1.7
 // Feel free to delete the comment at the next line. It is just for safely
 // updating the version in our release process.
 def grpcVersion = '1.37.0-SNAPSHOT' // CURRENT_GRPC_VERSION
-def nettyTcNativeVersion = '2.0.31.Final'
 def protocVersion = '3.12.0'
 
 dependencies {