mobile/android: Remove rules_android_ndk patch (#37726)

and ensure all ci is using the updated ndk Signed-off-by: Ryan Northey <[email protected]>
envoyproxy · Dec 18, 2024 · baa4c05 · baa4c05
1 parent b14be40
commit baa4c05
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 29 deletions.
diff --git 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
diff --git 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"