From 690fb5103d38f33438bb185456c96e95e4559f30 Mon Sep 17 00:00:00 2001
From: sheetalarkadam <100380551+sheetalarkadam@users.noreply.github.com>
Date: Mon, 25 Nov 2024 21:01:05 -0800
Subject: [PATCH] Override android qnn sdk version with pipeline param (#22895)

We need to be able to control/override the exact version of qnn sdk used
for the android build as qnn-runtime (maven package) releases are slower
to QNN SDK releases.
---
 .../azure-pipelines/c-api-noopenmp-packaging-pipelines.yml      | 2 +-
 tools/ci_build/github/azure-pipelines/templates/c-api-cpu.yml   | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/tools/ci_build/github/azure-pipelines/c-api-noopenmp-packaging-pipelines.yml b/tools/ci_build/github/azure-pipelines/c-api-noopenmp-packaging-pipelines.yml
index d2af289dc0d79..798868f3b957e 100644
--- a/tools/ci_build/github/azure-pipelines/c-api-noopenmp-packaging-pipelines.yml
+++ b/tools/ci_build/github/azure-pipelines/c-api-noopenmp-packaging-pipelines.yml
@@ -62,7 +62,7 @@ parameters:
 - name: QnnSdk
   displayName: QNN SDK Version
   type: string
-  default: 2.28.2.241116
+  default: 2.28.0.241029
 
 resources:
   repositories:
diff --git a/tools/ci_build/github/azure-pipelines/templates/c-api-cpu.yml b/tools/ci_build/github/azure-pipelines/templates/c-api-cpu.yml
index 71f71c9bc545a..b105e919c5b12 100644
--- a/tools/ci_build/github/azure-pipelines/templates/c-api-cpu.yml
+++ b/tools/ci_build/github/azure-pipelines/templates/c-api-cpu.yml
@@ -103,12 +103,14 @@ stages:
       enable_code_sign: ${{ parameters.DoEsrp }}
       packageName: 'onnxruntime-android-qnn'
       ReleaseVersionSuffix: $(ReleaseVersionSuffix)
+      QnnSDKVersion: ${{ parameters.QnnSDKVersion }}
 
   - template: android-java-api-aar-test.yml
     parameters:
       artifactName: 'onnxruntime-android-qnn-aar'
       job_name_suffix: 'QNN'
       packageName: 'onnxruntime-android-qnn'
+      QnnSDKVersion: ${{ parameters.QnnSDKVersion }}
 
 - stage: iOS_Full_xcframework
   dependsOn: []