From 9417625f516c06fed19653f7f22e5db0931565f9 Mon Sep 17 00:00:00 2001
From: akliuxingyuan <akliuxingyuan@gmail.com>
Date: Sat, 13 May 2023 17:13:27 +0800
Subject: [PATCH] fix build.gradle and update NDK to r25c

---
 app/build.gradle                   | 5 +++--
 app/nimbus.fml.yaml                | 2 ++
 automation/iceraven/install-sdk.sh | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 5537c05b0..c93665774 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -192,6 +192,7 @@ android {
             // Use custom default allowed addon list
             buildConfigField "String", "AMO_COLLECTION_USER", "\"16201230\""
             buildConfigField "String", "AMO_COLLECTION_NAME", "\"What-I-want-on-Fenix\""
+        }
         benchmark releaseTemplate >> {
             initWith buildTypes.nightly
             applicationIdSuffix ".fenix"
@@ -498,8 +499,8 @@ nimbus {
             fenixBeta: "beta",
             fenixRelease: "release",
             fenixForkDebug: "forkDebug",
-            fenixForkRelease: "forkRelease"
-            fenixBenchmark: "developer",
+            fenixForkRelease: "forkRelease",
+            fenixBenchmark: "developer"
     ]
     // This is generated by the FML and should be checked into git.
     // It will be fetched by Experimenter (the Nimbus experiment website)
diff --git a/app/nimbus.fml.yaml b/app/nimbus.fml.yaml
index 51fe63490..14607de3e 100644
--- a/app/nimbus.fml.yaml
+++ b/app/nimbus.fml.yaml
@@ -9,6 +9,8 @@ channels:
   - beta
   - nightly
   - developer
+  - forkDebug
+  - forkRelease
 import:
   - path: ../android-components/components/service/nimbus/messaging.fml.yaml
     channel: release
diff --git a/automation/iceraven/install-sdk.sh b/automation/iceraven/install-sdk.sh
index 6e204b0f5..2d043771d 100755
--- a/automation/iceraven/install-sdk.sh
+++ b/automation/iceraven/install-sdk.sh
@@ -20,7 +20,7 @@ popd
 export ANDROID_SDK_ROOT=$HOME/android-sdk/android-sdk-linux
 
 # Install the weirdly missing NDK
-${ANDROID_SDK_ROOT}/cmdline-tools/tools/bin/sdkmanager "ndk;21.0.6113669"
+${ANDROID_SDK_ROOT}/cmdline-tools/tools/bin/sdkmanager "ndk;25.2.9519653"
 
 # Point the build at the tools
 echo "sdk.dir=${ANDROID_SDK_ROOT}" >> local.properties
\ No newline at end of file