From 7a8bb0a545d12051e037f30045547dba91f0afe6 Mon Sep 17 00:00:00 2001
From: Andrei Litvin <andreilitvin@google.com>
Date: Tue, 6 Jun 2023 17:12:06 -0400
Subject: [PATCH] Fix missing search&repace from #26941

---
 examples/android/CHIPTool/app/build.gradle | 2 ++
 scripts/build/builders/android.py          | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/examples/android/CHIPTool/app/build.gradle b/examples/android/CHIPTool/app/build.gradle
index bdbd03ff48d822..9f116f92d04cd4 100644
--- a/examples/android/CHIPTool/app/build.gradle
+++ b/examples/android/CHIPTool/app/build.gradle
@@ -5,6 +5,8 @@ apply plugin: 'kotlin-parcelize'
 android {
     compileSdkVersion 31
 
+    ndkVersion "23.2.8568313"
+
     defaultConfig {
         applicationId "com.google.chip.chiptool"
         minSdkVersion 24
diff --git a/scripts/build/builders/android.py b/scripts/build/builders/android.py
index 11a29bc3bdaf9a..bab58f3f8b7b6e 100644
--- a/scripts/build/builders/android.py
+++ b/scripts/build/builders/android.py
@@ -546,7 +546,7 @@ def build_outputs(self):
                     "lib",
                     "jni",
                     self.board.AbiName(),
-                    "libSetupPayloadParser.so",
+                    "libOnboardingPayload.so",
                 ),
                 "jni/%s/libCHIPController.so"
                 % self.board.AbiName(): os.path.join(