From 6a3bfa7a62fdf690eafb20a761052f187df64872 Mon Sep 17 00:00:00 2001
From: Nicola Corti <ncor@meta.com>
Date: Tue, 25 Oct 2022 02:31:10 -0700
Subject: [PATCH] Bump NDK to 23 and fbjni to 0.3.0 (#35066)

Summary:
Pull Request resolved: https://github.com/facebook/react-native/pull/35066

This just bumps the NDK version used inside the template to be 23.
We can't merge this as it is but we have to wait for a bump of the Docker image for Android.

Changelog:
[Android] [Changed] - Bump NDK to 23

allow-large-files

Reviewed By: cipolleschi

Differential Revision: D40637103

fbshipit-source-id: e637140cbe6052e94a6efedf12f4b5b81b90a7eb
---
 ReactAndroid/gradle.properties          | 2 +-
 ReactAndroid/hermes-engine/build.gradle | 2 +-
 template/android/build.gradle           | 9 ++-------
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/ReactAndroid/gradle.properties b/ReactAndroid/gradle.properties
index e66d35b65f0..557a5f07e53 100644
--- a/ReactAndroid/gradle.properties
+++ b/ReactAndroid/gradle.properties
@@ -7,7 +7,7 @@ ANDROIDX_AUTOFILL_VERSION=1.1.0
 ANDROIDX_TEST_VERSION=1.1.0
 ANDROIDX_TRACING_VERSION=1.1.0
 ASSERTJ_VERSION=3.21.0
-FBJNI_VERSION=0.2.2
+FBJNI_VERSION=0.3.0
 FRESCO_VERSION=2.5.0
 INFER_ANNOTATIONS_VERSION=0.18.0
 JAVAX_INJECT_VERSION=1
diff --git a/ReactAndroid/hermes-engine/build.gradle b/ReactAndroid/hermes-engine/build.gradle
index d7d38e9ea1b..9ab86d50d1f 100644
--- a/ReactAndroid/hermes-engine/build.gradle
+++ b/ReactAndroid/hermes-engine/build.gradle
@@ -195,7 +195,7 @@ android {
     }
 
     dependencies {
-        implementation("com.facebook.fbjni:fbjni:0.2.2")
+        implementation("com.facebook.fbjni:fbjni:0.3.0")
         implementation("com.facebook.soloader:soloader:0.10.4")
         implementation("com.facebook.yoga:proguard-annotations:1.19.0")
         implementation("androidx.annotation:annotation:1.3.0")
diff --git a/template/android/build.gradle b/template/android/build.gradle
index 30133c1d5b3..bfa9a2b4292 100644
--- a/template/android/build.gradle
+++ b/template/android/build.gradle
@@ -7,13 +7,8 @@ buildscript {
         compileSdkVersion = 31
         targetSdkVersion = 31
 
-        if (System.properties['os.arch'] == "aarch64") {
-            // For M1 Users we need to use the NDK 24 which added support for aarch64
-            ndkVersion = "24.0.8215888"
-        } else {
-            // Otherwise we default to the side-by-side NDK version from AGP.
-            ndkVersion = "21.4.7075529"
-        }
+        // We use NDK 23 which has both M1 support and is the side-by-side NDK version from AGP.
+        ndkVersion = "23.1.7779620"
     }
     repositories {
         google()