From baa4c0554b6fedec09ba028f6a0bbf1d767dc76f Mon Sep 17 00:00:00 2001
From: phlax <phlax@users.noreply.github.com>
Date: Wed, 18 Dec 2024 14:48:04 +0000
Subject: [PATCH] mobile/android: Remove `rules_android_ndk` patch (#37726)

and ensure all ci is using the updated ndk

Signed-off-by: Ryan Northey <ryan@synca.io>
---
 mobile/bazel/envoy_mobile_repositories.bzl |  2 --
 mobile/bazel/rules_android_ndk.patch       | 25 ----------------------
 mobile/ci/linux_ci_setup.sh                |  4 ++--
 3 files changed, 2 insertions(+), 29 deletions(-)
 delete mode 100644 mobile/bazel/rules_android_ndk.patch

diff --git a/mobile/bazel/envoy_mobile_repositories.bzl b/mobile/bazel/envoy_mobile_repositories.bzl
index e691e75983fc..f482323e96bd 100644
--- a/mobile/bazel/envoy_mobile_repositories.bzl
+++ b/mobile/bazel/envoy_mobile_repositories.bzl
@@ -106,6 +106,4 @@ def android_repos():
         urls = ["https://github.com/bazelbuild/rules_android_ndk/archive/v0.1.2.tar.gz"],
         sha256 = "65aedff0cd728bee394f6fb8e65ba39c4c5efb11b29b766356922d4a74c623f5",
         strip_prefix = "rules_android_ndk-0.1.2",
-        patch_args = ["-p1"],
-        patches = ["//bazel:rules_android_ndk.patch"],
     )
diff --git a/mobile/bazel/rules_android_ndk.patch b/mobile/bazel/rules_android_ndk.patch
deleted file mode 100644
index a8bbc44efc19..000000000000
--- a/mobile/bazel/rules_android_ndk.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/ndk_cc_toolchain_config.bzl b/ndk_cc_toolchain_config.bzl
-index f668c3e..ed01d38 100644
---- a/ndk_cc_toolchain_config.bzl
-+++ b/ndk_cc_toolchain_config.bzl
-@@ -631,11 +631,6 @@ def ndk_cc_toolchain_config(
-                     actions = actions.all_link,
-                     flags = ["-Wl,-z,noexecstack"],
-                 ),
--                flag_set(
--                    actions = actions.all_link,
--                    flags = ["-Wl,-zseparate-code", "-Wl,--no-rosegment"],
--                    features = ["crosstool_linker_lld"],
--                ),
-                 # C++ compiles
-                 flag_set(
-                     actions = actions.all_cpp_compile,
-@@ -1381,7 +1376,7 @@ def ndk_cc_toolchain_config(
-                 ),
-                 flag_set(
-                     actions = actions.all_link,
--                    flags = ["-lc", "-lm", "-latomic", "-ldl"],
-+                    flags = ["-lc", "-lm", "-ldl"],
-                 ),
-                 # Inputs and outputs
-                 flag_set(
diff --git a/mobile/ci/linux_ci_setup.sh b/mobile/ci/linux_ci_setup.sh
index 7ca6d31ecb99..78cf51f2b067 100755
--- a/mobile/ci/linux_ci_setup.sh
+++ b/mobile/ci/linux_ci_setup.sh
@@ -7,6 +7,6 @@ ANDROID_HOME=$ANDROID_SDK_ROOT
 SDKMANAGER="${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager"
 "${SDKMANAGER}" --install "platform-tools" "platforms;android-30"
 "${SDKMANAGER}" --uninstall "ndk-bundle"
-"${SDKMANAGER}" --install "ndk;21.4.7075529"
+"${SDKMANAGER}" --install "ndk;26.3.11579264"
 "${SDKMANAGER}" --install "build-tools;30.0.2"
-echo "ANDROID_NDK_HOME=${ANDROID_HOME}/ndk/21.4.7075529" >> "$GITHUB_ENV"
+echo "ANDROID_NDK_HOME=${ANDROID_HOME}/ndk/26.3.11579264" >> "$GITHUB_ENV"